support handover of cleartext and encrypted credentials, refactor naming of methods

Dockerfile

@@ -16,8 +16,9 @@ ENV JWT_SECRET='streng_geheim'
 
 RUN \
     apt update && \
-    apt install -y libmariadbclient-dev && \
+    apt install -y postgresql-client-common && \
-    pip3 install mariadb && \
+    pip3 install psycopg2 && \
+    pip3 install loguru && \
     pip3 install dateparser && \
     pip3 install connexion && \
     pip3 install connexion[swagger-ui] && \

auth.py

@@ -1,11 +1,13 @@
 import time
 import connexion
-from jose import JWTError, jwt
+from jose import JWTError, jwt, jwe
+import json
 import werkzeug
 import os
-import mariadb
+import psycopg2
 from collections import namedtuple
 from pbkdf2 import crypt
+from loguru import logger
 
 DB_USER = os.environ["DB_USER"]
 DB_PASS = os.environ["DB_PASS"]
@@ -28,78 +30,97 @@ class PasswordMismatchException(Exception):
     pass
 
 
-UserEntry = namedtuple('UserEntry', ['id', 'login', 'expiry', 'claims'])
+UserEntry = namedtuple('UserEntry', ['id', 'login', 'pwhash', 'expiry', 'claims'])
 
 JWT_PRIV_KEY = ""
-with open('/opt/app/config/authservice.key', 'r') as f:
+try:
-    JWT_PRIV_KEY = f.read().replace('\n','')
+    JWT_PRIV_KEY = os.environ["JWT_PRIV_KEY"]
-print("DEBUG PRIVKEY: {}".format(JWT_PRIV_KEY))
+except KeyError:
+    with open('/opt/app/config/authservice.key', 'r') as f:
+        JWT_PRIV_KEY = f.read()
 
 JWT_PUB_KEY = ""
-with open('/opt/app/config/authservice.pub', 'r') as f:
+try:
-    JWT_PUB_KEY = f.read().replace('\n','')
+    JWT_PUB_KEY = os.environ["JWT_PUB_KEY"]
-print("DEBUG PUBKEY: {}".format(JWT_PUB_KEY))
+except KeyError:
+    with open('/opt/app/config/authservice.pub', 'r') as f:
+        JWT_PUB_KEY = f.read()
 
 
 def getUserEntryFromDB(application: str, login: str):
     conn = None
     cur = None
     try:
-        conn = mariadb.connect(user = DB_USER, password = DB_PASS,
+        conn = psycopg2.connect(user = DB_USER, password = DB_PASS,
                                 host = DB_HOST, database = DB_NAME)
         conn.autocommit = False
 
-        cur = conn.cursor(dictionary=True)
+        userObj = None
-        cur.execute("SELECT id, pwhash, expiry FROM user_application" +
+        with conn.cursor() as cur:
-                    "  WHERE application = ? AND login = ?", 
+            cur.execute("SELECT id, pwhash, expiry FROM user_application_v" +
-                    [application, login])
+                        "  WHERE application = %s AND login = %s", 
-        resObj = cur.next()
+                        (application, login))
-        print("DEBUG: getUserEntryFromDB: resObj: {}".format(resObj))
+            userObj = cur.fetchone()
-        if not resObj:
+            logger.debug("userObj: {}".format(userObj))
+            if not userObj:
                 raise NoUserException()
-        invObj = cur.next()
+            invObj = cur.fetchone()
             if invObj:
                 raise ManyUsersException()
 
-        userId = resObj["id"]
-        cur.execute("SELECT user, `key`, `value` FROM claims_for_user where user = ?", 
-                    [userId])
         claims = {}
+        with conn.cursor() as cur:
+            cur.execute('SELECT key, value FROM claims_for_user_v where "user" = %s and application = %s', 
+                        (userObj[0], application))
             for claimObj in cur:
-            print("DEBUG: getUserEntryFromDB: add claim {} -> {}".format(claimObj["key"], claimObj["value"]))
+                logger.debug("add claim {} -> {}".format(claimObj[0], claimObj[1]))
-            if claimObj["key"] in claims:
+                if claimObj[0] in claims:
-                if isinstance(claims[claimObj["key"]], list):
+                    if isinstance(claims[claimObj[0]], list):
-                    claims[claimObj["key"]].append(claimObj["value"])
+                        claims[claimObj[0]].append(claimObj[1])
                     else:
-                    claims[claimObj["key"]] = [ claims[claimObj["key"]] ]
+                        claims[claimObj[0]] = [ claims[claimObj[0]] ]
-                    claims[claimObj["key"]].append(claimObj["value"])
+                        claims[claimObj[0]].append(claimObj[1])
                 else:
-                claims[claimObj["key"]] = claimObj["value"]
+                    claims[claimObj[0]] = claimObj[1]
                 
-        userEntry = UserEntry(id=userId, login=login, expiry=resObj["expiry"], claims=claims)
+        userEntry = UserEntry(id=userObj[0], login=login, pwhash=userObj[1], expiry=userObj[2], claims=claims)
 
-        return userEntry, resObj["pwhash"]
+        return userEntry
-    except mariadb.Error as err:
+    except psycopg2.Error as err:
         raise Exception("Error when connecting to database: {}".format(err))
     finally:
-        if cur:
-            cur.close()
         if conn:
-            conn.rollback()
             conn.close()
 
 def getUserEntry(application, login, password):
-    userEntry, pwhash = getUserEntryFromDB(application, login)
+    userEntry = getUserEntryFromDB(application, login)
-    if pwhash != crypt(password, pwhash):
+    if userEntry.pwhash != crypt(password, userEntry.pwhash):
         raise PasswordMismatchException()
     return userEntry
 
 def generateToken(**args):
     try:
         body = args["body"]
+
+        application = ""
+        login = ""
+        password = ""
+        if (("application" in body) and
+            ("login" in body) and
+            ("password" in body)):
             application = body["application"]
             login = body["login"]
             password = body["password"]
+        elif ("encAleTuple" in body):
+            clearContent = jwe.decrypt(body["encAleTuple"], JWT_PRIV_KEY)
+            clearObj = json.loads(clearContent)
+            application = clearObj["application"]
+            login = clearObj["login"]
+            password = clearObj["password"]
+        else:
+            raise KeyError("Neither application, login and password nor encAleTuple given")
+        
+        logger.debug(f"Tuple: {application} {login} {password}")
     
         userEntry = getUserEntry(application, login, password)
     
@@ -108,28 +129,44 @@ def generateToken(**args):
             "iss": JWT_ISSUER,
             "iat": int(timestamp),
             "exp": int(timestamp + userEntry.expiry),
-            "sub": str(userEntry.id)
+            "sub": str(userEntry.id),
+            "aud": application
         }
+        logger.debug("claims: {}".format(userEntry.claims))
         for claim in userEntry.claims.items():
-            # print("DEBUG: generateToken: add claim {} -> {}".format(claim[0], claim[1]))
+            logger.debug("add claim {}".format(claim))
             payload[claim[0]] = claim[1]
 
         return jwt.encode(payload, JWT_PRIV_KEY, algorithm='RS256')
     except NoUserException:
-        print("ERROR: generateToken: no user found, login or application wrong")
+        logger.error("no user found, login or application wrong")
         raise werkzeug.exceptions.Unauthorized()
     except ManyUsersException:
-        print("ERROR: generateToken: too many users found")
+        logger.error("too many users found")
         raise werkzeug.exceptions.Unauthorized()
     except PasswordMismatchException:
-        print("ERROR: generateToken: wrong password")
+        logger.error("wrong password")
         raise werkzeug.exceptions.Unauthorized()
     except KeyError:
-        print("ERROR: generateToken: application, login or password missing")
+        logger.error("application, login or password missing")
         raise werkzeug.exceptions.Unauthorized()
     except Exception as e:
-        print("ERROR: generateToken: unspecific exception: {}".format(str(e)))
+        logger.error("unspecific exception: {}".format(str(e)))
         raise werkzeug.exceptions.Unauthorized()
 
 def getPubKey():
     return JWT_PUB_KEY
+
+def decodeToken(token):
+    try:
+        return jwt.decode(token, JWT_PUB_KEY, audience="test")
+    except JWTError as e:
+        logger.error("{}".format(e))
+        raise werkzeug.exceptions.Unauthorized()
+
+def testToken(user, token_info):
+    return '''
+    You are user_id {user} and the provided token has been signed by this issuers. Fine.'.
+    Decoded token claims: {token_info}.
+    '''.format(user=user, token_info=token_info)
+

build.sh

@@ -4,5 +4,5 @@ IMAGE_NAME="registry.hottis.de/wolutator/authservice"
 VERSION=0.0.1
 
 docker build -t ${IMAGE_NAME}:${VERSION} .
-docker push ${IMAGE_NAME}:${VERSION}
+# docker push ${IMAGE_NAME}:${VERSION}
 

initial-schema.sql

@@ -1,111 +1,61 @@
-CREATE DATABASE `authservice`;
+create sequence application_s start with 1 increment by 1;
-USE `authservice`;
+create table application_t (
+    id integer primary key not null default nextval('application_s'),
+    name varchar(128) not null unique
+);
 
-CREATE TABLE `applications` (
+create sequence user_s start with 1 increment by 1;
-    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+create table user_t (
-    `name` varchar(128) NOT NULL,
+    id integer primary key not null default nextval('user_s'),
-    CONSTRAINT PRIMARY KEY (`id`),
+    login varchar(64) not null unique,
-    CONSTRAINT UNIQUE KEY `uk_applications_name` (`name`)
+    pwhash varchar(64) not null,
-) ENGINE=InnoDB;
+    expiry integer not null default 600
+);
 
-CREATE TABLE `users` (
+create sequence claim_s start with 1 increment by 1;
-    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+create table claim_t (
-    `login` varchar(64) NOT NULL,
+    id integer primary key not null default nextval('claim_s'),
-    `pwhash` varchar(64) NOT NULL,
+    key varchar(64) not null,
-    `expiry` int(10) unsigned NOT NULL DEFAULT 600,
+    value varchar(64) not null,
-    CONSTRAINT PRIMARY KEY (`id`),
+    application integer not null references application(id),
-    CONSTRAINT UNIQUE KEY `uk_users_login` (`login`)
+    unique (key, value)
-) ENGINE=InnoDB;
+);
 
-CREATE TABLE `claims` (
+create table user_claim_mapping_t (
-    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+    "user" integer not null references user_t(id),
-    `key` varchar(64) NOT NULL,
+    claim integer not null references claim_t(id),
-    `value` varchar(1024) NOT NULL,
+    unique ("user", claim)
-    CONSTRAINT PRIMARY KEY (`id`),
+);
-    CONSTRAINT UNIQUE KEY `uk_claims_key_value` (`key`, `value`)
-) ENGINE=InnoDB;
 
-CREATE TABLE `user_claims_mapping` (
+create table user_application_mapping_t (
-    `user` int(10) unsigned NOT NULL,
+    "user" integer not null references user_t(id),
-    `claim` int(10) unsigned NOT NULL,
+    application integer not null references application_t(id),
-    CONSTRAINT UNIQUE KEY `uk_user_claims_mapping` (`user`, `claim` ),
+    unique ("user", application)
-    CONSTRAINT FOREIGN KEY `fk_user_claims_mapping_user` (`user`)
+);
-        REFERENCES `users`(`id`),
-    CONSTRAINT FOREIGN KEY `fk_user_claims_mapping_claim` (`claim`)
-        REFERENCES `claims`(`id`)
-) ENGINE=InnoDB;
 
-CREATE TABLE `user_applications_mapping` (
+create or replace view claims_for_user_v as
-    `user` int(10) unsigned NOT NULL,
+    select u.id as "user",
-    `application` int(10) unsigned NOT NULL,
+           a.name as application,
-    CONSTRAINT UNIQUE KEY `uk_user_applications_mapping` (`user`, `application` ),
+           c.key as key,
-    CONSTRAINT FOREIGN KEY `fk_user_applications_mapping_user` (`user`)
+           c.value as value
-        REFERENCES `users`(`id`),
+      from user_t u,
-    CONSTRAINT FOREIGN KEY `fk_user_applications_mapping_application` (`application`)
+           claim_t c,
-        REFERENCES `applications`(`id`)
+           user_claim_mapping_t m,
-) ENGINE=InnoDB;
+           application_t a
+      where m.user = u.id and
+            m.claim = c.id and 
+            a.id = c.application;
    
-CREATE OR REPLACE VIEW claims_for_user AS
+create or replace view user_application_v as
-    SELECT u.id AS user, 
+    select u.login as login,
-           c.`key` AS `key`, 
+           u.pwhash as pwhash,
-           c.`value` AS `value` 
+           u.id as id,
-        FROM users u, 
+           u.expiry as expiry,
-             claims c, 
-             user_claims_mapping m 
-        WHERE m.user = u.id AND
-              m.claim = c.id;
-
-CREATE OR REPLACE VIEW user_application AS   
-    SELECT u.login AS login,
-           u.pwhash AS pwhash,
-           u.id AS id,
-           u.expiry AS expiry,
            a.name as application
-        FROM users u,
+      from user_t u,
-             applications a,
+           application_t a,
-             user_applications_mapping m
+           user_application_mapping_t m
-        WHERE u.id = m.user AND
+      where u.id = m.user and
             a.id = m.application;
 
 
-CREATE USER 'authservice-ui'@'%' IDENTIFIED BY 'test123';
-GRANT SELECT ON `user_application` TO 'authservice-ui'@'%';
-GRANT SELECT ON `claims_for_user` TO 'authservice-ui'@'%';
-
-CREATE USER 'authservice-cli'@'%' IDENTIFIED BY 'test123';
-GRANT INSERT ON `users` TO 'authservice-cli'@'%';
-GRANT INSERT ON `user_applications_mapping` TO 'authservice-cli'@'%';
-
-FLUSH PRIVILEGES;
-
-INSERT INTO `applications` (`name`) VALUES ('hv');
-
-INSERT INTO `claims` (`key`, `value`) VALUES ('accesslevel', 'r');
-INSERT INTO `claims` (`key`, `value`) VALUES ('accesslevel', 'rw');
-
--- password is 'test123'
-INSERT INTO `users` (`login`, `pwhash`) VALUES ('wn', '$p5k2$186a0$dJXL0AjF$0HualDF92nyilDXPgSbaUn/UpFzSrpPx');
-INSERT INTO `user_applications_mapping` (`user`, `application`)
-  VALUES(
-      (SELECT `id` FROM `users` WHERE `login` = 'wn'),
-      (SELECT `id` FROM `applications` WHERE `name` = 'hv')
-  );
-INSERT INTO `user_claims_mapping` (`user`, `claim`)
-  VALUES(
-      (SELECT `id` FROM `users` WHERE `login` = 'wn'),
-      (SELECT `id` FROM `claims` WHERE `key` = 'accesslevel' AND `value` = 'rw')
-  );
-
--- password is 'geheim'
-INSERT INTO `users` (`login`, `pwhash`) VALUES ('gregor', '$p5k2$186a0$Tcwps8Ar$TsypGB.y1dCB9pWOPz2X2SsxYqrTn3Fv');
-INSERT INTO `user_applications_mapping` (`user`, `application`)
-  VALUES(
-      (SELECT `id` FROM `users` WHERE `login` = 'gregor'),
-      (SELECT `id` FROM `applications` WHERE `name` = 'hv')
-  );
-INSERT INTO `user_claims_mapping` (`user`, `claim`)
-  VALUES(
-      (SELECT `id` FROM `users` WHERE `login` = 'gregor'),
-      (SELECT `id` FROM `claims` WHERE `key` = 'accesslevel' AND `value` = 'rw')
-  );
-

openapi.yaml

@@ -4,16 +4,18 @@ info:
   version: "0.1"
 
 paths:
-  /auth:
+  /token:
     post:
       tags: [ "JWT" ]
-      summary: Return JWT token
+      summary: Accept encrypted or clear set of credentials, return JWT token 
       operationId: auth.generateToken
       requestBody:
         content:
           'application/json':
             schema:
-              $ref: '#/components/schemas/User'
+              anyOf:
+                - $ref: '#/components/schemas/User'
+                - $ref: '#/components/schemas/EncUser'
       responses:
         '200':
           description: JWT token
@@ -21,11 +23,11 @@ paths:
             'text/plain':
               schema:
                 type: string
-  /secret:
+  /test:
     get:
-      tags: [ "JWT" ]
+      tags: [ "Test" ]
       summary: Return secret string
-      operationId: test.getSecret
+      operationId: auth.testToken
       responses:
         '200':
           description: secret response
@@ -55,7 +57,7 @@ components:
       type: http
       scheme: bearer
       bearerFormat: JWT
-      x-bearerInfoFunc: test.decodeToken
+      x-bearerInfoFunc: auth.decodeToken
   schemas:
     User:
       description: Application/Login/Password tuple
@@ -67,3 +69,9 @@ components:
           type: string
         password: 
           type: string
+    EncUser:
+      description: Encrypted Application/Login/Password tuple
+      type: object
+      properties:
+        encAleTuple:
+          type: string

test.py

@@ -1,20 +1,8 @@
-from jose import JWTError, jwt
+import connexion
-import os
+import logging
-import werkzeug
 
+logging.basicConfig(level=logging.DEBUG)
 
-JWT_SECRET = os.environ['JWT_SECRET']
+app = connexion.App('authservice')
-
+app.add_api('./openapi.yaml')
-def decodeToken(token):
+app.run(port=8080)
-    try:
-        return jwt.decode(token, JWT_SECRET)
-    except JWTError as e:
-        print("ERROR: decodeToken: {}".format(e))
-        raise werkzeug.exceptions.Unauthorized()
-
-def getSecret(user, token_info):
-    return '''
-    You are user_id {user} and the secret is 'wbevuec'.
-    Decoded token claims: {token_info}.
-    '''.format(user=user, token_info=token_info)
-

testjwe.py

@@ -0,0 +1,28 @@
+import unittest
+from jose import jwe
+import os
+import json
+
+JWT_PUB_KEY = os.environ["JWT_PUB_KEY"]
+JWT_PRIV_KEY = os.environ["JWT_PRIV_KEY"]
+
+class JweTestMethods(unittest.TestCase):
+    def test_encryptDecrypt(self):
+        inObj = {"application":"test", "login":"wn", "password":"joshua"}
+        plainText = json.dumps(inObj)
+
+        cryptText = jwe.encrypt(plainText, JWT_PUB_KEY, "A256GCM", "RSA-OAEP")
+        print(cryptText)
+
+        clearText = jwe.decrypt(cryptText, JWT_PRIV_KEY)
+        print(clearText)
+
+        outObj = json.loads(clearText)
+        print(outObj)
+
+        self.assertEqual(outObj, inObj)
+
+
+
+if __name__ == '__main__':
+    unittest.main()