Merge branch 'dev' into 'main'

Dev

See merge request oscar.krause/fastapi-dls!28

.DEBIAN/control

@@ -2,7 +2,7 @@ Package: fastapi-dls
 Version: 0.0
 Architecture: all
 Maintainer: Oscar Krause oscar.krause@collinwebdesigns.de
-Depends: python3, python3-fastapi, python3-uvicorn, python3-dotenv, python3-dateutil, python3-jose, python3-sqlalchemy, python3-pycryptodome, python3-markdown, python3-jinja2, uvicorn, openssl
+Depends: python3, python3-fastapi, python3-uvicorn, python3-dotenv, python3-dateutil, python3-jose, python3-sqlalchemy, python3-pycryptodome, python3-markdown, uvicorn, openssl
 Recommends: curl
 Installed-Size: 10240
 Homepage: https://git.collinwebdesigns.de/oscar.krause/fastapi-dls

.PKGBUILD/PKGBUILD

@@ -8,7 +8,7 @@ pkgdesc='NVIDIA DLS server implementation with FastAPI'
 arch=('any')
 url='https://git.collinwebdesigns.de/oscar.krause/fastapi-dls'
 license=('MIT')
-depends=('python' 'python-jose' 'python-starlette' 'python-httpx' 'python-fastapi' 'python-dotenv' 'python-dateutil' 'python-sqlalchemy' 'python-pycryptodome' 'python-jinja' 'uvicorn' 'python-markdown' 'openssl')
+depends=('python' 'python-jose' 'python-starlette' 'python-httpx' 'python-fastapi' 'python-dotenv' 'python-dateutil' 'python-sqlalchemy' 'python-pycryptodome' 'uvicorn' 'python-markdown' 'openssl')
 provider=("$pkgname")
 install="$pkgname.install"
 backup=('etc/default/fastapi-dls')
@@ -37,52 +37,17 @@ check() {
 }
 
 package() {
-    # create directories
     install -d "$pkgdir/usr/share/doc/$pkgname"
     install -d "$pkgdir/var/lib/$pkgname/cert"
-
-    # copy docs & static files
     cp -r "$srcdir/$pkgname/doc"/* "$pkgdir/usr/share/doc/$pkgname/"
     install -Dm644 "$srcdir/$pkgname/README.md" "$pkgdir/usr/share/doc/$pkgname/README.md"
     install -Dm644 "$srcdir/$pkgname/version.env" "$pkgdir/usr/share/doc/$pkgname/version.env"
-    sed -i "s/README.md/\/usr\/share\/doc\/$pkgname\/README.md/g" "$srcdir/$pkgname/app/main.py"
 
-    # copy main app python files
+    sed -i "s/README.md/\/usr\/share\/doc\/$pkgname\/README.md/g" "$srcdir/$pkgname/app/main.py"
     sed -i "s/join(dirname(__file__), 'cert\//join('\/var\/lib\/$pkgname', 'cert\//g" "$srcdir/$pkgname/app/main.py"
     install -Dm755 "$srcdir/$pkgname/app/main.py" "$pkgdir/opt/$pkgname/main.py"
     install -Dm755 "$srcdir/$pkgname/app/orm.py" "$pkgdir/opt/$pkgname/orm.py"
     install -Dm755 "$srcdir/$pkgname/app/util.py" "$pkgdir/opt/$pkgname/util.py"
-
-    # copy static asset files
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/css/bootstrap.min.css" "$pkgdir/opt/$pkgname/static/assets/css/bootstrap.min.css"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/css/bootstrap-icons.min.css" "$pkgdir/opt/$pkgname/static/assets/css/bootstrap-icons.min.css"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/css/custom.css" "$pkgdir/opt/$pkgname/static/assets/css/custom.css"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/css/dashboard.css" "$pkgdir/opt/$pkgname/static/assets/css/dashboard.css"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/fonts/bootstrap-icons.woff" "$pkgdir/opt/$pkgname/static/assets/fonts/bootstrap-icons.woff"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/fonts/bootstrap-icons.woff2" "$pkgdir/opt/$pkgname/static/assets/fonts/bootstrap-icons.woff2"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/img/favicons/android-chrome-192x192.png" "$pkgdir/opt/$pkgname/static/assets/img/favicons/android-chrome-192x192.png"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/img/favicons/android-chrome-512x512.png" "$pkgdir/opt/$pkgname/static/assets/img/favicons/android-chrome-512x512.png"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/img/favicons/apple-touch-icon.png" "$pkgdir/opt/$pkgname/static/assets/img/favicons/apple-touch-icon.png"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/img/favicons/favicon.ico" "$pkgdir/opt/$pkgname/static/assets/img/favicons/favicon.ico"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/img/favicons/favicon-16x16.png" "$pkgdir/opt/$pkgname/static/assets/img/favicons/favicon-16x16.png"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/img/favicons/favicon-32x32.png" "$pkgdir/opt/$pkgname/static/assets/img/favicons/favicon-32x32.png"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/img/favicons/manifest.json" "$pkgdir/opt/$pkgname/static/assets/img/favicons/manifest.json"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/img/logo.png" "$pkgdir/opt/$pkgname/static/assets/img/logo.png"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/js/bootstrap.min.js" "$pkgdir/opt/$pkgname/static/assets/js/bootstrap.min.js"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/js/helper.js" "$pkgdir/opt/$pkgname/static/assets/js/helper.js"
-    install -Dm755 "$srcdir/$pkgname/app/static/assets/js/popper.min.js" "$pkgdir/opt/$pkgname/static/assets/js/popper.min.js"
-    install -Dm755 "$srcdir/$pkgname/app/templates/components/navbar.html" "$pkgdir/opt/$pkgname/templates/components/navbar.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/components/sidebar.html" "$pkgdir/opt/$pkgname/templates/components/sidebar.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/layouts/base.html" "$pkgdir/opt/$pkgname/templates/layouts/base.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/layouts/bootstrap.html" "$pkgdir/opt/$pkgname/templates/layouts/bootstrap.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/layouts/bootstrap-dashboard.html" "$pkgdir/opt/$pkgname/templates/layouts/bootstrap-dashboard.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/views/dashboard.html" "$pkgdir/opt/$pkgname/templates/views/dashboard.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/views/dashboard_leases.html" "$pkgdir/opt/$pkgname/templates/views/dashboard_leases.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/views/dashboard_origins.html" "$pkgdir/opt/$pkgname/templates/views/dashboard_origins.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/views/dashboard_readme.html" "$pkgdir/opt/$pkgname/templates/views/dashboard_readme.html"
-    install -Dm755 "$srcdir/$pkgname/app/templates/views/index.html" "$pkgdir/opt/$pkgname/templates/views/index.html"
-
-    # copy service files
     install -Dm644 "$srcdir/$pkgname.default" "$pkgdir/etc/default/$pkgname"
     install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
     install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"

.gitlab-ci.yml

@@ -8,6 +8,9 @@ include:
 cache:
   key: one-key-to-rule-them-all
 
+variables:
+  DOCKER_BUILDX_PLATFORM: "linux/amd64,linux/arm64"
+
 build:docker:
   image: docker:dind
   interruptible: true
@@ -17,7 +20,6 @@ build:docker:
       changes:
         - app/**/*
         - Dockerfile
-        - requirements.txt
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   tags: [ docker ]
   before_script:
@@ -26,7 +28,7 @@ build:docker:
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
-    - docker buildx build --progress=plain --platform linux/amd64,linux/arm64 --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE --push .
+    - docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE --push .
     - docker buildx imagetools inspect $IMAGE
     - echo "CS_IMAGE=$IMAGE" > container_scanning.env
   artifacts:
@@ -264,24 +266,24 @@ gemnasium-python-dependency_scanning:
 
 deploy:docker:
   extends: .deploy
+  image: docker:dind
   stage: deploy
+  tags: [ docker ]
   before_script:
     - echo "Building docker image for commit $CI_COMMIT_SHA with version $CI_COMMIT_REF_NAME"
+    - docker buildx inspect
+    - docker buildx create --use
   script:
     - echo "========== GitLab-Registry =========="
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME
-    - docker build . --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:$CI_COMMIT_REF_NAME
-    - docker build . --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:latest
-    - docker push $IMAGE:$CI_COMMIT_REF_NAME
-    - docker push $IMAGE:latest
+    - IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH
+    - docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:$CI_COMMIT_REF_NAME --push .
+    - docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:latest --push .
     - echo "========== Docker-Hub =========="
     - docker login -u $PUBLIC_REGISTRY_USER -p $PUBLIC_REGISTRY_TOKEN
     - IMAGE=$PUBLIC_REGISTRY_USER/$CI_PROJECT_NAME
-    - docker build . --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:$CI_COMMIT_REF_NAME
-    - docker build . --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:latest
-    - docker push $IMAGE:$CI_COMMIT_REF_NAME
-    - docker push $IMAGE:latest
+    - docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:$CI_COMMIT_REF_NAME --push .
+    - docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:latest --push .
 
 deploy:apt:
   # doc: https://git.collinwebdesigns.de/help/user/packages/debian_repository/index.md#install-a-package

README.md

@@ -38,7 +38,7 @@ Tested with Ubuntu 22.10 (from Proxmox templates), actually its consuming 100mb
 Docker-Images are available here:
 
 - [Docker-Hub](https://hub.docker.com/repository/docker/collinwebdesigns/fastapi-dls): `collinwebdesigns/fastapi-dls:latest`
-- [GitLab-Registry](https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/container_registry): `registry.git.collinwebdesigns.de/oscar.krause/fastapi-dls/main:latest`
+- [GitLab-Registry](https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/container_registry): `registry.git.collinwebdesigns.de/oscar.krause/fastapi-dls:latest`
 
 The images include database drivers for `postgres`, `mariadb` and `sqlite`.
 
@@ -423,14 +423,15 @@ client has 19.2 hours in which to re-establish connectivity before its license e
 
 Successfully tested with this package versions:
 
-| vGPU Suftware | vGPU Manager | Linux Driver | Windows Driver | Release Date  |
-|---------------|--------------|--------------|----------------|---------------|
-| `15.3`        | `525.125.03` | `525.125.06` | `529.11`       | June 2023     |
-| `15.2`        | `525.105.14` | `525.105.17` | `528.89`       | March 2023    |
-| `15.1`        | `525.85.07`  | `525.85.05`  | `528.24`       | January 2023  |
-| `15.0`        | `525.60.12`  | `525.60.13`  | `527.41`       | December 2022 |
-| `14.4`        | `510.108.03` | `510.108.03` | `514.08`       | December 2022 |
-| `14.3`        | `510.108.03` | `510.108.03` | `513.91`       | November 2022 |
+| vGPU Suftware | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date  |
+|---------------|--------------------|--------------|----------------|---------------|
+| `16.0`        | `535.54.06`        | `535.54.03`  | `536.25`       | July 2023     |
+| `15.3`        | `525.125.03`       | `525.125.06` | `529.11`       | June 2023     |
+| `15.2`        | `525.105.14`       | `525.105.17` | `528.89`       | March 2023    |
+| `15.1`        | `525.85.07`        | `525.85.05`  | `528.24`       | January 2023  |
+| `15.0`        | `525.60.12`        | `525.60.13`  | `527.41`       | December 2022 |
+| `14.4`        | `510.108.03`       | `510.108.03` | `514.08`       | December 2022 |
+| `14.3`        | `510.108.03`       | `510.108.03` | `513.91`       | November 2022 |
 
 - https://docs.nvidia.com/grid/index.html
 

app/main.py

@@ -18,8 +18,6 @@ from starlette.middleware.cors import CORSMiddleware
 from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-from starlette.staticfiles import StaticFiles
-from starlette.templating import Jinja2Templates
 
 from util import load_key, load_file
 from orm import Origin, Lease, init as db_init, migrate
@@ -32,9 +30,6 @@ VERSION, COMMIT, DEBUG = env('VERSION', 'unknown'), env('COMMIT', 'unknown'), bo
 
 config = dict(openapi_url=None, docs_url=None, redoc_url=None)  # dict(openapi_url='/-/openapi.json', docs_url='/-/docs', redoc_url='/-/redoc')
 app = FastAPI(title='FastAPI-DLS', description='Minimal Delegated License Service (DLS).', version=VERSION, **config)
-app.mount('/static', StaticFiles(directory=join(dirname(__file__), 'static'), html=True), name='static'),
-templates = Jinja2Templates(directory=join(dirname(__file__), 'templates'))
-
 db = create_engine(str(env('DATABASE', 'sqlite:///db.sqlite')))
 db_init(db), migrate(db)
 
@@ -76,14 +71,14 @@ def __get_token(request: Request) -> dict:
     return jwt.decode(token=token, key=jwt_decode_key, algorithms=ALGORITHMS.RS256, options={'verify_aud': False})
 
 
-@app.get('/', summary='* Index')
+@app.get('/', summary='Index')
 async def index():
-    return RedirectResponse('/-/')
+    return RedirectResponse('/-/readme')
 
 
 @app.get('/-/', summary='* Index')
-async def _index(request: Request):
-    return templates.TemplateResponse(name='views/index.html', context={'request': request, 'VERSION': VERSION})
+async def _index():
+    return RedirectResponse('/-/readme')
 
 
 @app.get('/-/health', summary='* Health')
@@ -111,32 +106,48 @@ async def _config():
 
 
 @app.get('/-/readme', summary='* Readme')
-async def _readme(request: Request):
+async def _readme():
     from markdown import markdown
     content = load_file('../README.md').decode('utf-8')
-    markdown = markdown(text=content, extensions=['tables', 'fenced_code', 'md_in_html', 'nl2br', 'toc'])
-    context = {'request': request, 'markdown': markdown, 'VERSION': VERSION}
-    return templates.TemplateResponse(name='views/dashboard_readme.html', context=context)
+    return HTMLr(markdown(text=content, extensions=['tables', 'fenced_code', 'md_in_html', 'nl2br', 'toc']))
 
 
 @app.get('/-/manage', summary='* Management UI')
 async def _manage(request: Request):
-    return templates.TemplateResponse(name='views/manage.html', context={'request': request, 'VERSION': VERSION})
+    response = '''
+    <!DOCTYPE html>
+    <html>
+        <head>
+            <title>FastAPI-DLS Management</title>
+        </head>
+        <body>
+            <button onclick="deleteOrigins()">delete ALL origins and their leases</button>
+            <button onclick="deleteLease()">delete specific lease</button>
+            
+            <script>
+                function deleteOrigins() {
+                    const response = confirm('Are you sure you want to delete all origins and their leases?');
 
-
-@app.get('/-/dashboard', summary='* Dashboard')
-async def _dashboard(request: Request):
-    return templates.TemplateResponse(name='views/dashboard.html', context={'request': request, 'VERSION': VERSION})
-
-
-@app.get('/-/dashboard/origins', summary='* Dashboard - Origins')
-async def _dashboard_origins(request: Request):
-    return templates.TemplateResponse(name='views/dashboard_origins.html', context={'request': request, 'VERSION': VERSION})
-
-
-@app.get('/-/dashboard/leases', summary='* Dashboard - Leases')
-async def _dashboard_origins(request: Request):
-    return templates.TemplateResponse(name='views/dashboard_leases.html', context={'request': request, 'VERSION': VERSION})
+                    if (response) {
+                        var xhr = new XMLHttpRequest();
+                        xhr.open("DELETE", '/-/origins', true);
+                        xhr.send();
+                    }
+                }
+                function deleteLease(lease_ref) {
+                    if(lease_ref === undefined)
+                        lease_ref = window.prompt("Please enter 'lease_ref' which should be deleted");
+                    if(lease_ref === null || lease_ref === "")
+                        return
+                    var xhr = new XMLHttpRequest();
+                    xhr.open("DELETE", `/-/lease/${lease_ref}`, true);
+                    xhr.send();
+                }
+            </script>
+        </body>
+    </html>
+    '''
+    return HTMLr(response)
 
 
 @app.get('/-/origins', summary='* Origins')
@@ -159,13 +170,6 @@ async def _origins_delete(request: Request):
     return Response(status_code=201)
 
 
-@app.delete('/-/origins/{origin_ref}', summary='* Origins')
-async def _origins_delete_origin_ref(request: Request, origin_ref: str):
-    if Origin.delete(db, [origin_ref]) == 1:
-        return Response(status_code=201)
-    return JSONr(status_code=404, content={'status': 404, 'detail': 'lease not found'})
-
-
 @app.get('/-/leases', summary='* Leases')
 async def _leases(request: Request, origin: bool = False):
     session = sessionmaker(bind=db)()

app/orm.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 
 from sqlalchemy import Column, VARCHAR, CHAR, ForeignKey, DATETIME, update, and_, inspect, text
@@ -61,7 +61,7 @@ class Origin(Base):
         if origin_refs is None:
             deletions = session.query(Origin).delete()
         else:
-            deletions = session.query(Origin).filter(Origin.origin_ref.in_(origin_refs)).delete()
+            deletions = session.query(Origin).filter(Origin.origin_ref in origin_refs).delete()
         session.commit()
         session.close()
         return deletions
@@ -89,10 +89,10 @@ class Lease(Base):
             'lease_ref': self.lease_ref,
             'origin_ref': self.origin_ref,
             # 'scope_ref': self.scope_ref,
-            'lease_created': self.lease_created.replace(tzinfo=timezone.utc).isoformat(),
-            'lease_expires': self.lease_expires.replace(tzinfo=timezone.utc).isoformat(),
-            'lease_updated': self.lease_updated.replace(tzinfo=timezone.utc).isoformat(),
-            'lease_renewal': lease_renewal.replace(tzinfo=timezone.utc).isoformat(),
+            'lease_created': self.lease_created.isoformat(),
+            'lease_expires': self.lease_expires.isoformat(),
+            'lease_updated': self.lease_updated.isoformat(),
+            'lease_renewal': lease_renewal.isoformat(),
         }
 
     @staticmethod

app/static/assets/css/custom.css

@@ -1,56 +0,0 @@
-/*
-    Original: #76b900
-    Darken 1: #5DA000 (10%)
-    Darken 2: #438600 (20%)
-    Darken 3: #2A6D00 (30%)
-    Darken 4: #105300 (40%)
-    Darken 5: #003A00 (50%)
-*/
-
-
-.text-primary {
-    color: #76b900 !important;
-}
-
-.lead {
-    color: #105300 !important;
-}
-
-.navbar-green {
-    background-color: #76b900 !important;
-}
-
-.navbar-brand {
-    background-color: transparent;
-    color: #ffffff;
-}
-
-.navbar-brand:focus, .navbar-brand:hover {
-    color: #fcfcfc;
-}
-
-.btn-primary {
-    background-color: #76b900 !important;
-    border-color: #76b900 !important;
-}
-
-.btn-primary:focus, .btn-primary:hover {
-    background-color: #5DA000 !important;
-    border-color: #5DA000 !important;
-}
-
-code {
-    color: #105300 !important;
-}
-
-.sidebar .nav-link.active {
-    color: #76b900 !important;
-}
-
-.sidebar .nav-link:focus, .sidebar .nav-link:hover {
-    color: #105300 !important;
-}
-
-.navbar-nav .nav-item .nav-link {
-    color: white !important;
-}

app/static/assets/css/dashboard.css

@@ -1,101 +0,0 @@
-body {
-  font-size: .875rem;
-}
-
-.feather {
-  width: 16px;
-  height: 16px;
-  vertical-align: text-bottom;
-}
-
-/*
- * Sidebar
- */
-
-.sidebar {
-  position: fixed;
-  top: 0;
-  /* rtl:raw:
-  right: 0;
-  */
-  bottom: 0;
-  /* rtl:remove */
-  left: 0;
-  z-index: 100; /* Behind the navbar */
-  padding: 48px 0 0; /* Height of navbar */
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
-}
-
-@media (max-width: 767.98px) {
-  .sidebar {
-    top: 0;
-  }
-}
-
-.sidebar-sticky {
-  position: relative;
-  top: 0;
-  height: calc(100vh - 48px);
-  padding-top: .5rem;
-  overflow-x: hidden;
-  overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
-}
-
-.sidebar .nav-link {
-  font-weight: 500;
-  color: #333;
-}
-
-.sidebar .nav-link .feather {
-  margin-right: 4px;
-  color: #727272;
-}
-
-.sidebar .nav-link.active {
-  color: #2470dc;
-}
-
-.sidebar .nav-link:hover .feather,
-.sidebar .nav-link.active .feather {
-  color: inherit;
-}
-
-.sidebar-heading {
-  font-size: .75rem;
-  text-transform: uppercase;
-}
-
-/*
- * Navbar
- */
-
-.navbar-brand {
-  padding-top: .75rem;
-  padding-bottom: .75rem;
-  font-size: 1rem;
-  background-color: rgba(0, 0, 0, .25);
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
-}
-
-.navbar .navbar-toggler {
-  top: .25rem;
-  right: 1rem;
-}
-
-.navbar .form-control {
-  padding: .75rem 1rem;
-  border-width: 0;
-  border-radius: 0;
-}
-
-.form-control-dark {
-  color: #fff;
-  background-color: rgba(255, 255, 255, .1);
-  border-color: rgba(255, 255, 255, .1);
-}
-
-.form-control-dark:focus {
-  border-color: transparent;
-  box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
-}
-

app/static/assets/img/favicons/manifest.json

@@ -1 +0,0 @@
-{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

app/static/assets/js/helper.js

@@ -1,133 +0,0 @@
-async function fetchConfig(element) {
-    let xhr = new XMLHttpRequest();
-    xhr.open("GET", '/-/config', true);
-    xhr.onreadystatechange = function () {
-        if (xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200) {
-            element.innerHTML = JSON.stringify(JSON.parse(xhr.response),null,2);
-        }
-    };
-    xhr.send();
-}
-
-async function fetchOriginsWithLeases(element) {
-    let xhr = new XMLHttpRequest();
-    xhr.open("GET", '/-/origins?leases=true', true);
-    xhr.onreadystatechange = function () {
-        if (xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200) {
-            const x = JSON.parse(xhr.response)
-            console.debug(x)
-
-            element.innerHTML = ''
-            let table = document.createElement('table')
-            table.classList.add('table', 'mt-4');
-            let thead = document.createElement('thead');
-            thead.innerHTML = `
-                    <tr>
-                        <th scope="col">origin</th>
-                        <th scope="col">hostname</th>
-                        <th scope="col">OS</th>
-                        <th scope="col">driver version</th>
-                        <th scope="col">leases</th>
-                    </tr>`
-            table.appendChild(thead)
-            let tbody = document.createElement('thead');
-            x.sort((a, b) => a.hostname.localeCompare(b.hostname)).forEach((o) => {
-                let row = document.createElement('tr');
-                row.innerHTML = `
-                        <td><code>${o.origin_ref}</code></td>
-                        <td>${o.hostname}</td>
-                        <td>${o.os_platform} (${o.os_version})</td>
-                        <td>${o.guest_driver_version}</td>
-                        <td>${o.leases.map(x => `<code title="expires: ${x.lease_expires}">${x.lease_ref}</code>`).join(', ')}</td>`
-                tbody.appendChild(row);
-            })
-            table.appendChild(tbody)
-            element.appendChild(table)
-        }
-    };
-    xhr.send();
-}
-
-async function fetchLeases(element) {
-    // datetime config
-    const dtc = {
-        year: "numeric",
-        month: "2-digit",
-        day: "2-digit",
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit",
-        timeZoneName: "short"
-    }
-
-    let xhr = new XMLHttpRequest();
-    xhr.open("GET", '/-/leases?origin=true', true);
-    xhr.onreadystatechange = function () {
-        if (xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200) {
-            const x = JSON.parse(xhr.response)
-            console.debug(x)
-
-            element.innerHTML = ''
-            let table = document.createElement('table')
-            table.classList.add('table', 'mt-4');
-            let thead = document.createElement('thead');
-            thead.innerHTML = `
-                    <tr>
-                        <th scope="col">lease</th>
-                        <th scope="col">created</th>
-                        <th scope="col">updated</th>
-                        <th scope="col">next renew</th>
-                        <th scope="col">expires</th>
-                        <th scope="col">origin</th>
-                    </tr>`
-            table.appendChild(thead)
-            let tbody = document.createElement('thead');
-            x.sort((a, b) => new Date(a.lease_expires) - new Date(b.lease_expires)).forEach((o) => {
-                let row = document.createElement('tr');
-                row.innerHTML = `
-                        <td><code>${o.lease_ref}</code></td>
-                        <td>${new Date(o.lease_created).toLocaleDateString('system', dtc)}</td>
-                        <td>${new Date(o.lease_updated).toLocaleDateString('system', dtc)}</td>
-                        <td>${new Date(o.lease_renewal).toLocaleDateString('system', dtc)}</td>
-                        <td>${new Date(o.lease_expires).toLocaleDateString('system', dtc)}</td>
-                        <td><code title="hostname: ${o.origin?.hostname}">${o.origin_ref}</code></td>`
-                tbody.appendChild(row);
-            })
-            table.appendChild(tbody)
-            element.appendChild(table)
-        }
-    };
-    xhr.send();
-}
-
-async function deleteOrigins() {
-    let xhr = new XMLHttpRequest();
-    xhr.open("DELETE", '/-/origins', true);
-    xhr.send();
-}
-
-async function deleteOrigin(origin_ref) {
-    if (origin_ref === undefined)
-        origin_ref = window.prompt("Please enter 'origin_ref' which should be deleted");
-    if (origin_ref === null || origin_ref === "")
-        return
-    let xhr = new XMLHttpRequest();
-    xhr.open("DELETE", `/-/origins/${origin_ref}`, true);
-    xhr.send();
-}
-
-async function deleteLease(lease_ref) {
-    if (lease_ref === undefined)
-        lease_ref = window.prompt("Please enter 'lease_ref' which should be deleted");
-    if (lease_ref === null || lease_ref === "")
-        return
-    let xhr = new XMLHttpRequest();
-    xhr.open("DELETE", `/-/lease/${lease_ref}`, true);
-    xhr.send();
-}
-
-async function deleteExpiredLeases() {
-    let xhr = new XMLHttpRequest();
-    xhr.open("DELETE", `/-/leases/expired`, true);
-    xhr.send();
-}

app/templates/components/navbar.html

@@ -1,6 +0,0 @@
-<header class="navbar navbar-expand-md navbar-green sticky-top bg-dark flex-md-nowrap p-0 shadow">
-    <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="/-/">FastAPI-DLS {{ VERSION }}</a>
-    <button class="navbar-toggler position-absolute d-lg-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-</header>

app/templates/components/sidebar.html

@@ -1,58 +0,0 @@
-<nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
-    <div class="position-sticky pt-3">
-        <ul class="nav flex-column">
-            <li class="nav-item">
-                <a class="nav-link {{ 'active' if request.url.path == '/-/dashboard' }}" aria-current="page" href="/-/dashboard">
-                    <i class="bi-house-door"></i> Dashboard
-                </a>
-            </li>
-             <li class="nav-item">
-                <a class="nav-link {{ 'active' if request.url.path == '/-/dashboard/origins' }}" aria-current="page" href="/-/dashboard/origins">
-                    <i class="bi-pc-display-horizontal"></i> Origins
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link {{ 'active' if request.url.path == '/-/dashboard/leases' }}" aria-current="page" href="/-/dashboard/leases">
-                    <i class="bi-layers"></i> Leases
-                </a>
-            </li>
-        </ul>
-
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted text-uppercase">
-            <span>Help</span>
-        </h6>
-        <ul class="nav flex-column">
-            <li class="nav-item">
-                <a class="nav-link {{ 'active' if request.url.path == '/-/readme' }}" aria-current="page" href="/-/readme">
-                    <i class="bi-question-circle"></i> Readme
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" aria-current="page" href="https://git.collinwebdesigns.de/oscar.krause/fastapi-dls" target="_blank">
-                    <i class="bi-git"></i> Git Repo
-                </a>
-            </li>
-        </ul>
-
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted text-uppercase">
-            <span>Integrations</span>
-        </h6>
-        <ul class="nav flex-column">
-            <li class="nav-item">
-                <a class="nav-link" aria-current="page" href="/-/doc" target="_blank">
-                    <i class="bi-file-text"></i> Swagger UI
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" aria-current="page" href="/-/redoc" target="_blank">
-                    <i class="bi-file-text"></i> Redoc
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" aria-current="page" href="/-/openapi.json"  target="_blank">
-                    <i class="bi bi-filetype-json"></i> OpenAPI JSON
-                </a>
-            </li>
-        </ul>
-    </div>
-</nav>

app/templates/layouts/base.html

@@ -1,33 +0,0 @@
-<!doctype html>
-<html lang="en" class="h-100">
-<head>
-    {% block title %}
-        <title>FastAPI-DLS</title>
-    {% endblock %}
-
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
-
-    <link rel="icon" href="{{ url_for('static', path='assets/img/favicons/favicon-32x32.png') }}" sizes="32x32" type="image/png">
-    <link rel="icon" href="{{ url_for('static', path='assets/img/favicons/favicon-16x16.png') }}" sizes="16x16" type="image/png">
-    <link rel="manifest" href="{{ url_for('static', path='assets/img/favicons/manifest.json') }}">
-    <link rel="icon" href="{{ url_for('static', path='assets/img/favicons/favicon.ico') }}">
-    <link rel="apple-touch-icon" href="{{ url_for('static', path='assets/img/favicons/apple-touch-icon.png') }}" sizes="180x180">
-
-    {% block styles %}
-    {% endblock %}
-
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', path='assets/css/custom.css') }}">
-</head>
-<body class="d-flex flex-column {% block body_class %}{% endblock %}">
-{% block body %}
-{% endblock %}
-
-
-<script src="{{ url_for('static', path='assets/js/helper.js') }}"></script>
-
-{% block scripts %}
-{% endblock %}
-</body>
-</html>

app/templates/layouts/bootstrap-dashboard.html

@@ -1,16 +0,0 @@
-{% extends 'layouts/bootstrap.html' %}
-
-{% block body %}
-{% include 'components/navbar.html' %}
-
-<div class="container-fluid">
-    <div class="row">
-        {% include 'components/sidebar.html' %}
-
-        <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4">
-            {% block content %}
-            {% endblock %}
-        </main>
-    </div>
-</div>
-{% endblock %}

app/templates/layouts/bootstrap.html

@@ -1,14 +0,0 @@
-{% extends 'layouts/base.html' %}
-
-{% block styles %}
-{{ super() }}
-<link rel="stylesheet" type="text/css" href="{{ url_for('static', path='assets/css/bootstrap.min.css') }}">
-<link rel="stylesheet" type="text/css" href="{{ url_for('static', path='assets/css/bootstrap-icons.min.css') }}">
-<link rel="stylesheet" type="text/css" href="{{ url_for('static', path='assets/css/dashboard.css') }}">
-
-<script src="{{ url_for('static', path='assets/js/popper.min.js') }}"></script>
-<script src="{{ url_for('static', path='assets/js/bootstrap.min.js') }}"></script>
-{% endblock %}
-
-
-

app/templates/views/dashboard.html

@@ -1,50 +0,0 @@
-{% extends 'layouts/bootstrap-dashboard.html' %}
-
-{% block title %}
-<title>Dashboard</title>
-{% endblock %}
-
-{% block content %}
-<div>
-    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-        <h1 class="h2">Dashboard</h1>
-        <div class="btn-toolbar mb-2 mb-md-0">
-            <div class="btn-group me-2">
-                <button type="button" class="btn btn-sm btn-outline-secondary" onclick="downloadClientToken()">
-                    <i class="bi bi-download"></i>
-                    Client Token
-                </button>
-            </div>
-        </div>
-    </div>
-
-    <div class="p-5 mb-4 bg-light rounded-3">
-        <div class="container-fluid py-5">
-            <h1 class="display-5 fw-bold">FastAPI-DLS</h1>
-            <p class="col-md-8 fs-4">Minimal Delegated License Service (DLS).</p>
-
-            <a href="https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/-/releases" class="btn btn-primary btn-lg" target="_blank">
-                Releases &raquo;
-            </a>
-        </div>
-    </div>
-
-    <pre id="config"></pre>
-</div>
-{% endblock %}
-
-{% block scripts %}
-{{ super() }}
-<script type="application/javascript">
-    function downloadClientToken() {
-        window.open('/-/client-token', "_blank")
-    }
-
-    function load() {
-        const config = document.getElementById('config')
-        fetchConfig(config)
-    }
-
-    load()
-</script>
-{% endblock %}

app/templates/views/dashboard_leases.html

@@ -1,41 +0,0 @@
-{% extends 'layouts/bootstrap-dashboard.html' %}
-
-{% block title %}
-<title>Origins</title>
-{% endblock %}
-
-{% block content %}
-    <div>
-        <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-            <h1 class="h2">Leases <small>with origin</small></h1>
-            <div class="btn-toolbar mb-2 mb-md-0">
-                <div class="btn-group me-2">
-                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteLease().finally(() => load())">
-                        delete lease
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteExpiredLeases().finally(() => load())">
-                        delete all expired leases
-                    </button>
-                </div>
-
-                <button type="button" class="btn btn-sm btn-outline-secondary" onclick="load()" title="refresh">
-                    <i class="bi bi-arrow-clockwise"></i>
-                </button>
-            </div>
-        </div>
-
-        <div id="leases" class="mt-3"></div>
-    </div>
-{% endblock %}
-
-{% block scripts %}
-{{ super() }}
-<script type="application/javascript">
-    function load() {
-        const leases = document.getElementById('leases')
-        fetchLeases(leases)
-    }
-
-    load()
-</script>
-{% endblock %}

app/templates/views/dashboard_origins.html

@@ -1,48 +0,0 @@
-{% extends 'layouts/bootstrap-dashboard.html' %}
-
-{% block title %}
-<title>Origins</title>
-{% endblock %}
-
-{% block content %}
-    <div>
-        <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-            <h1 class="h2">Origins <small>with leases</small></h1>
-            <div class="btn-toolbar mb-2 mb-md-0">
-                <div class="btn-group me-2">
-                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigin().finally(() => load())">
-                        delete origin
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOriginsWrapper()">
-                        delete all
-                    </button>
-                </div>
-
-                <button type="button" class="btn btn-sm btn-outline-secondary" onclick="load()" title="refresh">
-                    <i class="bi bi-arrow-clockwise"></i>
-                </button>
-            </div>
-        </div>
-
-        <div id="origins" class="mt-3"></div>
-    </div>
-{% endblock %}
-
-{% block scripts %}
-{{ super() }}
-    <script type="application/javascript">
-        function load() {
-            const origins = document.getElementById('origins')
-            fetchOriginsWithLeases(origins)
-        }
-
-        load()
-
-        function deleteOriginsWrapper() {
-            const response = confirm('Are you sure you want to delete all origins and their leases?');
-
-            if (response)
-                deleteOrigins().finally(() => load())
-        }
-    </script>
-{% endblock %}

app/templates/views/dashboard_readme.html

@@ -1,15 +0,0 @@
-{% extends 'layouts/bootstrap-dashboard.html' %}
-
-{% block title %}
-<title>Origins</title>
-{% endblock %}
-
-{% block content %}
-<div>
-    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-        <div class="overflow-hidden">
-            {{ markdown|safe }}
-        </div>
-    </div>
-</div>
-{% endblock %}

app/templates/views/index.html

@@ -1,26 +0,0 @@
-{% extends 'layouts/bootstrap.html' %}
-
-{% block title %}
-<title>Index</title>
-{% endblock %}
-
-{% block body_class %}h-100{% endblock %}
-
-{% block body %}
-<main class="flex-shrink-0">
-    <div class="container">
-        <h1 class="mt-5 text-primary">FastAPI-DLS</h1>
-        <p class="lead">Minimal Delegated License Service (DLS).</p>
-        <p>
-            <a href="/-/dashboard">Dashboard</a>,
-            <a href="/-/readme">Readme</a>
-        </p>
-    </div>
-</main>
-
-<footer class="footer mt-auto py-3 bg-light">
-    <div class="container">
-        <span class="text-muted">FastAPI-DLS Version {{ VERSION }}</span>
-    </div>
-</footer>
-{% endblock %}

requirements.txt

@@ -1,9 +1,8 @@
-fastapi==0.99.1
+fastapi==0.100.0
 uvicorn[standard]==0.22.0
 python-jose==3.3.0
 pycryptodome==3.18.0
 python-dateutil==2.8.2
-sqlalchemy==2.0.17
+sqlalchemy==2.0.18
 markdown==3.4.3
 python-dotenv==1.0.0
-jinja2==3.1.2

test/main.py

@@ -59,8 +59,8 @@ def test_readme():
     assert response.status_code == 200
 
 
-def test_dashboard():
-    response = client.get('/-/dashboard')
+def test_manage():
+    response = client.get('/-/manage')
     assert response.status_code == 200