From e40592d14caf8b4c8d8e13b9623aeef7fee0eb4a Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Mon, 3 Dec 2018 13:38:37 -0500 Subject: BUG FIX: Properly decodes ssh public keyfile Because of how Python3 changed how it handled strings, the byte string read from the user's keyfile was not directly serializable. This decodes the bytes into a unicode string, assuming UTF-8 encoding. Change-Id: I5f723a61fb577fa6d4e76e701ef529521ab389ba Signed-off-by: Parker Berberian --- src/api/admin.py | 2 ++ src/api/models.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/api/admin.py b/src/api/admin.py index 3d32c78..8b2fcb3 100644 --- a/src/api/admin.py +++ b/src/api/admin.py @@ -17,6 +17,7 @@ from api.models import ( HardwareConfig, NetworkConfig, SoftwareConfig, + AccessConfig, AccessRelation, SoftwareRelation, HostHardwareRelation, @@ -33,6 +34,7 @@ admin.site.register(OpnfvApiConfig) admin.site.register(HardwareConfig) admin.site.register(NetworkConfig) admin.site.register(SoftwareConfig) +admin.site.register(AccessConfig) admin.site.register(AccessRelation) admin.site.register(SoftwareRelation) admin.site.register(HostHardwareRelation) diff --git a/src/api/models.py b/src/api/models.py index 78ec920..b6bd79f 100644 --- a/src/api/models.py +++ b/src/api/models.py @@ -652,7 +652,7 @@ class JobFactory(object): revoke=False, job=job, context={ - "key": user.userprofile.ssh_public_key.read(), + "key": user.userprofile.ssh_public_key.open().read().decode(encoding="UTF-8"), "hosts": [host.labid for host in hosts] } ) -- cgit 1.2.3-korg