a&a

Dockerfile

@@ -10,6 +10,10 @@ ENV DB_HOST="172.16.10.18"
 ENV DB_NAME="hausverwaltung"
 ENV DB_USER="hausverwaltung-ui"
 ENV DB_PASS="test123"
+ENV JWT_ISSUER='de.hottis.hausverwaltung'
+ENV JWT_SECRET='streng_geheim'
+ENV JWT_LIFETIME_SECONDS=60
+ENV JWT_ALGORITHM='HS256'
 
 
 RUN \
@@ -20,9 +24,7 @@ RUN \
     pip3 install connexion && \
     pip3 install connexion[swagger-ui] && \
     pip3 install uwsgi && \
-    pip3 install flask-cors && \
+    pip3 install flask-cors
-    pip3 install python-jose[cryptography] && \
-    pip3 install six
 
 RUN \
     mkdir -p ${APP_DIR} && \

ENV.tmpl

@@ -5,3 +5,4 @@ export DB_USER="hausverwaltung-ui"
 export DB_PASS="test123"
 export DB_NAME="hausverwaltung"
 
+export JWT_SECRET='streng_geheim'

Mieter.py

@@ -1,6 +1,8 @@
 from dbpool import getConnection, getMany, getOne
+from auth import check_scope
 
-def get_mieters():
+def get_mieters(token_info):
+    check_scope(token_info, [ "mieter/read", "wohnung/read", "objekt/read" ])
     return getMany("""
 SELECT m.id as id, 
        o.id as objekt,
@@ -21,7 +23,8 @@ SELECT m.id as id,
         w.id = m.wohnung
     """, [], "Mieter")
 
-def get_mieter(id=None):
+def get_mieter(id, token_info):
+    check_scope(token_info, [ "mieter/read", "wohnung/read", "objekt/read" ])
     return getOne("""
 SELECT m.id as id, 
        o.id as objekt,

Objekte.py

@@ -1,8 +1,11 @@
 from dbpool import getConnection, getMany, getOne
+from auth import check_scope
 
-def get_objekte():
+def get_objekte(token_info):
+    check_scope(token_info, "objekt/read")
     return getMany("SELECT id, shortname, flaeche FROM objekt", [], "Objekt")
 
-def get_objekt(id=None):
+def get_objekt(id, token_info):
+    check_scope(token_info, "objekt/read")
     return getOne("SELECT id, shortname, flaeche FROM objekt WHERE id = ?", 
                   (id,), "Objekt")

Wohnungen.py

@@ -1,6 +1,9 @@
 from dbpool import getConnection, getOne, getMany
+from auth import check_scope
 
-def get_wohnungen():
+
+def get_wohnungen(token_info):
+    check_scope(token_info, "wohnung/read")
     return getMany("""
 SELECT w.id as id, 
        w.objekt as objekt, 
@@ -11,7 +14,8 @@ SELECT w.id as id,
   WHERE o.id = w.objekt
 """, [], "Wohnung")
 
-def get_wohnung(id=None):
+def get_wohnung(id, token_info):
+    check_scope(token_info, [ "wohnung/read", "objekt/read" ])
     return getOne("""
 SELECT w.id as id, 
        w.objekt as objekt, 
@@ -23,7 +27,8 @@ SELECT w.id as id,
         w.id = ?
 """, (id, ), "Wohnung")
 
-def get_wohnungen_by_objekt(id):
+def get_wohnungen_by_objekt(id, token_info):
+    check_scope(token_info, [ "wohnung/read", "objekt/read" ])
     return getMany("""
 SELECT w.id as id, 
        w.objekt as objekt, 

ZahlungenForderungen.py

@@ -2,8 +2,10 @@ from dbpool import getConnection, getOne, getMany, putOne
 import datetime
 import decimal
 import dateparser
+from auth import check_scope
 
-def get_zahlungen_by_mieter(mieter_id):
+def get_zahlungen_by_mieter(mieter_id, token_info):
+  check_scope(token_info, "zahlung/read")
   return getMany("""
 SELECT id, 
        mieter, 
@@ -28,7 +30,8 @@ SELECT id,
 """, [ id ], "Zahlung")
 
 
-def get_forderungen_by_mieter(mieter_id):
+def get_forderungen_by_mieter(mieter_id, token_info):
+  check_scope(token_info, "forderung/read")
   return getMany("""
 SELECT id, 
        mieter,
@@ -40,7 +43,8 @@ SELECT id,
   WHERE mieter = ?
 """, [ mieter_id ], "Forderung")
 
-def get_forderung(id):
+def get_forderung(id, token_info):
+  check_scope(token_info, "forderung/read")
   return getOne("""
 SELECT id, 
        mieter,
@@ -52,7 +56,8 @@ SELECT id,
   WHERE id = ?
 """, [ id ], "Forderung")
 
-def get_zahlungforderung_by_mieter_and_year(mieter_id, year):
+def get_zahlungforderung_by_mieter_and_year(mieter_id, year, token_info):
+  check_scope(token_info, [ "forderung/read", "zahlung/read", "mieter/read" ])
   if year == 0:
     year = datetime.datetime.now().year
   start_date = "{}-01-01".format(year)
@@ -72,7 +77,8 @@ WHERE mieter = ? AND
   datum_soll BETWEEN ? AND ?
 """, [mieter_id, start_date, end_date], "ZahlungForderung")
 
-def get_saldo_by_mieter_and_year(mieter_id, year):
+def get_saldo_by_mieter_and_year(mieter_id, year, token_info):
+  check_scope(token_info, [ "forderung/read", "zahlung/read", "mieter/read" ])
   if year == 0:
     year = datetime.datetime.now().year
   start_date = "{}-01-01".format(year)
@@ -106,7 +112,8 @@ WHERE mieter = ? AND
     "zahlungen": float(sumZ)
   }
 
-def put_zahlung(zahlung):
+def put_zahlung(zahlung, token_info):
+  check_scope(token_info, "zahlung/write")
   print("Input of put_zahlung: {} {}".format(type(zahlung), zahlung))
   datum_soll = dateparser.parse(zahlung["datum_soll"], languages=["de"])
   datum_ist = dateparser.parse(zahlung["datum_ist"], languages=["de"])

auth.py

@@ -1,36 +1,35 @@
-
 import time
-
 import connexion
-import six
+from werkzeug.exceptions import Unauthorized, Forbidden
-from werkzeug.exceptions import Unauthorized
-
 from jose import JWTError, jwt
+import os
 
-JWT_ISSUER = 'de.hottis.hausverwaltung'
+JWT_SECRET = os.environ['JWT_SECRET']
-JWT_SECRET = 'streng_geheim'
-JWT_LIFETIME_SECONDS = 600
-JWT_ALGORITHM = 'HS256'
 
 
-def generate_token(user_id):
-    timestamp = _current_timestamp()
-    payload = {
-        "iss": JWT_ISSUER,
-        "iat": int(timestamp),
-        "exp": int(timestamp + JWT_LIFETIME_SECONDS),
-        "sub": str(user_id),
-    }
-
-    return jwt.encode(payload, JWT_SECRET, algorithm=JWT_ALGORITHM)
-
 
 def decode_token(token):
     try:
-        return jwt.decode(token, JWT_SECRET, algorithms=[JWT_ALGORITHM])
+        print("DEBUG decode_token: try to decode")
+        token_info = jwt.decode(token, JWT_SECRET)
+        print("DEBUG decode_token: token_info: {}".format(token_info))
+        return token_info
     except JWTError as e:
-        six.raise_from(Unauthorized, e)
+        print("ERROR decode_token: error when decoding token: {}".format(e))
+        raise Unauthorized()
 
+def check_token(token, key, value):
+    if (key in token) and ((token[key] == value) or (isinstance(token[key], list) and (value in token[key]))):
+        return True
+    print("WARN: check_token: {} -> {} required but not granted".format(key, value))
+    raise Forbidden()
+
+def check_scope(token, value):
+    if isinstance(value, list):
+        for v in value:
+            check_token(token, "x-scope", v)
+    else:
+        check_token(token, "x-scope", value)
 
 def get_secret(user, token_info) -> str:
     return '''
@@ -39,6 +38,7 @@ def get_secret(user, token_info) -> str:
     '''.format(user=user, token_info=token_info)
 
 
+
 def _current_timestamp() -> int:
     return int(time.time())
 

openapi.yaml

@@ -1,7 +1,10 @@
 openapi: 3.0.0
 info:
-  title: Hausverwaltung-JWT
+  title: Hausverwaltung
-  version: "0.2"
+  version: "0.1"
+
+security:
+  - jwt: []
 
 paths:
   /hv/objekte:
@@ -12,10 +15,12 @@ paths:
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Objekt'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Objekt'
         404:
           description: No Objekte available
         500:
@@ -28,13 +33,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Objekt'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Objekt'
         404:
           description: Objekt not found
         500:
@@ -47,10 +55,12 @@ paths:
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Wohnung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Wohnung'
         404:
           description: No Wohnung available
         500:
@@ -63,15 +73,18 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Wohnung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Wohnung'
         404:
           description: No Wohnung available
         500:
@@ -84,13 +97,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Wohnung'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Wohnung'
         404:
           description: Wohnung not found
         500:
@@ -103,14 +119,19 @@ paths:
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Mieter'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Mieter'
         404:
           description: No Mieter available
         500:
           description: Some server error
+      security:
+      - jwt: ['secret']
+
   /hv/mieter/{id}:
     get:
       tags: [ "Mieter" ]
@@ -119,13 +140,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Mieter'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Mieter'
         404:
           description: Mieter not found
         500:
@@ -138,13 +162,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Forderung'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Forderung'
         404:
           description: Forderung not found
         500:
@@ -157,15 +184,18 @@ paths:
       parameters:
         - name: mieter_id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Forderung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Forderung'
         404:
           description: No Forderung available
         500:
@@ -178,13 +208,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Zahlung'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Zahlung'
         404:
           description: Zahlung not found
         500:
@@ -197,15 +230,18 @@ paths:
       parameters:
         - name: mieter_id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Zahlung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Zahlung'
         404:
           description: No Zahlung available
         500:
@@ -218,19 +254,23 @@ paths:
       parameters:
         - name: mieter_id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
         - name: year
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/ZahlungForderung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/ZahlungForderung'
         404:
           description: No ZahlungForderung available
         500:
@@ -243,17 +283,21 @@ paths:
       parameters:
         - name: mieter_id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
         - name: year
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response
-          schema:
+          content:
-            $ref: '#/components/Saldo'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Saldo'
         404:
           description: Neither Forderungen nor Zahlungen available
         500:
@@ -263,39 +307,19 @@ paths:
       tags: [ "Zahlung" ]
       operationId: ZahlungenForderungen.put_zahlung
       summary: Inserts a new Zahlung
-      parameters:
+      requestBody:
-        - name: zahlung
+        content:
-          in: body
+          'application/json':
-          schema:
+            schema:
-            $ref: '#/components/Zahlung'
+              $ref: '#/components/schemas/Zahlung'
       responses:
         202:
           description: Zahlung successfully inserted
         500:
           description: Some server or database error
-  /auth/{user_id}:
-    get:
-      tags: [ "jwt" ]
-      summary: Return JWT token
-      operationId: auth.generate_token
-      parameters:
-      - name: user_id
-        description: User unique identifier
-        in: path
-        required: true
-        example: 12
-        schema:
-          type: integer
-      responses:
-        '200':
-          description: JWT token
-          content:
-            'text/plain':
-              schema:
-                type: string
   /secret:
     get:
-      tags: [ "jwt" ]
+      tags: [ "JWT" ]
       summary: Return secret string
       operationId: auth.get_secret
       responses:
@@ -305,131 +329,132 @@ paths:
             'text/plain':
               schema:
                 type: string
-      security:
+
-      - jwt: ['secret']
+
 
 components:
-  Objekt:
-    description: Objekt type
-    type: object
-    properties:
-      id: 
-        type: integer
-      shortname: 
-        type: string
-      flaeche:
-        type: number
-  Wohnung:
-    description: Wohnung type
-    type: object
-    properties:
-      id: 
-        type: integer
-      objekt: 
-        type: integer
-      shortname: 
-        type: string
-      flaeche:
-        type: number
-      objekt_shortname:
-        type: string
-  Mieter:
-    description: Mieter type
-    type: object
-    properties:
-      id: 
-        type: integer
-      objekt: 
-        type: integer
-      wohnung: 
-        type: integer
-      wohnung_shortname:
-        type: string
-      objekt_shortname:
-        type: string
-      anrede:
-        type: string
-      vorname:
-        type: string
-      nachname:
-        type: string
-      strasse:
-        type: string
-      plz:
-        type: string
-      ort:
-        type: string
-      telefon:
-        type: string
-      einzug:
-        type: string
-      auszug:
-        type: string
-  Forderung:
-    description: Forderung type
-    type: object
-    properties:
-      id:
-        type: integer
-      mieter:
-        type: integer
-      datum:
-        type: string
-      betrag:
-        type: number
-      kommentar:
-        type: string
-      ref_wohnung:
-        type: number
-  Zahlung:
-    description: Zahlung type
-    type: object
-    properties:
-      id:
-        type: integer
-      mieter:
-        type: integer
-      datum_ist:
-        type: string
-      datum_soll:
-        type: string
-      betrag:
-        type: number
-      kommentar:
-        type: string
-  ZahlungForderung:
-    description: ZahlungForderung type
-    type: object
-    properties:
-      zf_type:
-        type: string
-      id:
-        type: integer
-      datum_soll:
-        type: string
-      datum_ist:
-        type: string
-      betrag_zahlung:
-        type: number
-      betrag_forderung:
-        type: number
-      kommentar:
-        type: string
-      mieter:
-        type: number
-  Saldo:
-    description: Saldo type
-    type: object
-    properties:
-      forderungen:
-        type: number
-      zahlungen:
-        type: number
-      saldo:
-        type: number
   securitySchemes:
     jwt:
       type: http
       scheme: bearer
       bearerFormat: JWT
-      x-bearerInfoFunc: auth.decode_token
+      x-bearerInfoFunc: auth.decode_token
+  schemas:
+    Objekt:
+      description: Objekt type
+      type: object
+      properties:
+        id: 
+          type: integer
+        shortname: 
+          type: string
+        flaeche:
+          type: number
+    Wohnung:
+      description: Wohnung type
+      type: object
+      properties:
+        id: 
+          type: integer
+        objekt: 
+          type: integer
+        shortname: 
+          type: string
+        flaeche:
+          type: number
+        objekt_shortname:
+          type: string
+    Mieter:
+      description: Mieter type
+      type: object
+      properties:
+        id: 
+          type: integer
+        objekt: 
+          type: integer
+        wohnung: 
+          type: integer
+        wohnung_shortname:
+          type: string
+        objekt_shortname:
+          type: string
+        anrede:
+          type: string
+        vorname:
+          type: string
+        nachname:
+          type: string
+        strasse:
+          type: string
+        plz:
+          type: string
+        ort:
+          type: string
+        telefon:
+          type: string
+        einzug:
+          type: string
+        auszug:
+          type: string
+    Forderung:
+      description: Forderung type
+      type: object
+      properties:
+        id:
+          type: integer
+        mieter:
+          type: integer
+        datum:
+          type: string
+        betrag:
+          type: number
+        kommentar:
+          type: string
+        ref_wohnung:
+          type: number
+    Zahlung:
+      description: Zahlung type
+      type: object
+      properties:
+        id:
+          type: integer
+        mieter:
+          type: integer
+        datum_ist:
+          type: string
+        datum_soll:
+          type: string
+        betrag:
+          type: number
+        kommentar:
+          type: string
+    ZahlungForderung:
+      description: ZahlungForderung type
+      type: object
+      properties:
+        zf_type:
+          type: string
+        id:
+          type: integer
+        datum_soll:
+          type: string
+        datum_ist:
+          type: string
+        betrag_zahlung:
+          type: number
+        betrag_forderung:
+          type: number
+        kommentar:
+          type: string
+        mieter:
+          type: number
+    Saldo:
+      description: Saldo type
+      type: object
+      properties:
+        forderungen:
+          type: number
+        zahlungen:
+          type: number
+        saldo:
+          type: number

run.sh

@@ -15,4 +15,8 @@ docker run \
     -e DB_USER=$DB_USER \
     -e DB_PASS=$DB_PASS \
     -e DB_NAME=$DB_NAME \
+    -e JWT_ISSUER=$JWT_ISSUER \
+    -e JWT_SECRET=$JWT_SECRET \
+    -e JWT_LIFETIME_SECONDS=$JWT_LIFETIME_SECONDS \
+    -e JWT_ALGORITHM=$JWT_ALGORITHM
     ${IMAGE_NAME}:${VERSION}

server.py

@@ -3,7 +3,7 @@ from flask_cors import CORS
 
 # instantiate the webservice
 app = connexion.App(__name__)
-app.add_api('swagger.yaml')
+app.add_api('openapi.yaml')
 
 # CORSify it - otherwise Angular won't accept it
 CORS(app.app)