Chg: helm set v2.0.0-RC1 image

.github/workflows/ci.yml

@@ -13,7 +13,6 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/*'
 
 defaults:
   run:
@@ -26,78 +25,45 @@ jobs:
       DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
       DOCKER_REGISTRY_USERNAME: ucentral
     steps:
-    - name: Checkout actions repo
-      uses: actions/checkout@v3
-      with:
-        repository: Telecominfraproject/.github
-        path: github
+    - uses: actions/checkout@v2
 
-    - name: Build and push Docker image
-      uses: ./github/composite-actions/docker-image-build
-      with:
-        image_name: owsec
-        registry: tip-tip-wlan-cloud-ucentral.jfrog.io
-        registry_user: ucentral
-        registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+    - name: Build Docker image
+      run: docker build -t wlan-cloud-owsec:${{ github.sha }} .
 
-    - name: Notify on failure via Slack
-      if: failure() && github.ref == 'refs/heads/main'
-      uses: rtCamp/action-slack-notify@v2
-      env:
-        SLACK_USERNAME: GitHub Actions failure notifier
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-        SLACK_COLOR: "${{ job.status }}"
-        SLACK_ICON: https://raw.githubusercontent.com/quintessence/slack-icons/master/images/github-logo-slack-icon.png
-        SLACK_TITLE: Docker build failed for OWSec service
-
-  trigger-testing:
-    if: startsWith(github.ref, 'refs/pull/')
-    runs-on: ubuntu-latest
-    needs: docker
-    steps:
-    - name: Get base branch name and set as output
-      id: get_base_branch
+    - name: Tag Docker image
       run: |
-        echo "branch=$(echo ${GITHUB_BASE_REF##*/})" >> $GITHUB_OUTPUT
-        echo "owgw_branch=$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')" >> $GITHUB_OUTPUT
+        TAGS="${{ github.sha }}"
 
-    - name: Checkout actions repo
-      uses: actions/checkout@v3
-      with:
-        repository: Telecominfraproject/.github
-        path: github
+        if [[ ${GITHUB_REF} == "refs/heads/"* ]]
+        then
+          CURRENT_TAG=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')
+          TAGS="$TAGS $CURRENT_TAG"
+        else
+          if [[ ${GITHUB_REF} == "refs/tags/"* ]]
+          then
+            CURRENT_TAG=$(echo ${GITHUB_REF#refs/tags/} | tr '/' '-')
+            TAGS="$TAGS $CURRENT_TAG"
+          else # PR build
+            CURRENT_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
+            TAGS="$TAGS $CURRENT_TAG"
+          fi
+        fi
 
-    - name: Trigger testing of OpenWifi Docker Compose deployment and wait for result
-      uses: ./github/composite-actions/trigger-workflow-and-wait
-      env:
-        BASE_BRANCH: ${{ steps.get_base_branch.outputs.branch }}
-        OWGW_BASE_BRANCH: ${{ steps.get_base_branch.outputs.owgw_branch }}
-      with:
-        owner: Telecominfraproject
-        repo: wlan-testing
-        workflow: ow_docker-compose.yml
-        token: ${{ secrets.WLAN_TESTING_PAT }}
-        ref: master
-        inputs: '{"deployment_version": "${{ env.BASE_BRANCH }}", "owgw_version": "${{ env.OWGW_BASE_BRANCH }}", "owsec_version": "${{ github.sha }}", "owfms_version": "${{ env.BASE_BRANCH }}", "owprov_version": "${{ env.BASE_BRANCH }}", "owanalytics_version": "${{ env.BASE_BRANCH }}", "owsub_version": "${{ env.BASE_BRANCH }}", "microservice": "owsec"}'
+        echo "Result tags: $TAGS"
 
-  trigger-deploy-to-dev:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    needs:
-      - docker
-    steps:
-    - name: Checkout actions repo
-      uses: actions/checkout@v3
-      with:
-        repository: Telecominfraproject/.github
-        path: github
+        for tag in $TAGS; do
+          docker tag wlan-cloud-owsec:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/owsec:$tag
+        done
 
-    - name: Trigger deployment of the latest version to dev instance and wait for result
-      uses: ./github/composite-actions/trigger-workflow-and-wait
+    - name: Log into Docker registry
+      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
+      uses: docker/login-action@v1
       with:
-        owner: Telecominfraproject
-        repo: wlan-testing
-        workflow: ucentralgw-dev-deployment.yaml
-        token: ${{ secrets.WLAN_TESTING_PAT }}
-        ref: master
-        inputs: '{"force_latest": "true"}'
+        registry: ${{ env.DOCKER_REGISTRY_URL }}
+        username: ${{ env.DOCKER_REGISTRY_USERNAME }}
+        password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
+    - name: Push Docker images
+      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
+      run: |
+        docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/owsec | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {}

.github/workflows/cleanup.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/*'
     types: [ closed ]
 
 defaults:
@@ -17,10 +16,4 @@ jobs:
     steps:
       - run: |
           export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-
-          if [[ ! $PR_BRANCH_TAG =~ (main|master|release-*) ]]; then
-            echo "PR branch is $PR_BRANCH_TAG, deleting Docker image"
-            curl -s -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owsec/$PR_BRANCH_TAG"
-          else
-            echo "PR branch is $PR_BRANCH_TAG, not deleting Docker image"
-          fi
+          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owsec/$PR_BRANCH_TAG"

.github/workflows/enforce-jira-issue-key.yml

@@ -1,24 +0,0 @@
-name: Ensure Jira issue is linked
-
-on:
-  pull_request:
-    types: [opened, edited, reopened, synchronize]
-    branches:
-      - 'release/*'
-
-jobs:
-  check_for_issue_key:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout actions repo
-        uses: actions/checkout@v3
-        with:
-          repository: Telecominfraproject/.github
-          path: github
-
-      - name: Run JIRA check
-        uses: ./github/composite-actions/enforce-jira-issue-key
-        with:
-          jira_base_url: ${{ secrets.TIP_JIRA_URL }}
-          jira_user_email: ${{ secrets.TIP_JIRA_USER_EMAIL }}
-          jira_api_token: ${{ secrets.TIP_JIRA_API_TOKEN }}

.github/workflows/openapi-pages.yml

@@ -1,38 +0,0 @@
-name: Update OpenAPI docs on GitHub Pages
-
-on:
-  push:
-    paths:
-      - 'openapi/**'
-    branches:
-      - main
-  workflow_dispatch:
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  docsgen:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Generate static HTML page with docs from OpenAPI definition
-        run: |
-          docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli:v6.2.1 generate -i https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentralsec/main/openpapi/owsec.yaml -g html2 --skip-validate-spec -o /local/
-
-      - name: Update OpenAPI docs
-        run: |
-          mkdir -p ~/.ssh
-          ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-          echo https://tip-automation:${{ secrets.GIT_PUSH_PAT }}@github.com > ~/.git-credentials
-          git config --global credential.helper store
-          git config --global user.email "tip-automation@telecominfraproject.com"
-          git config --global user.name "TIP Automation User"
-          git pull
-          git checkout gh-pages || git checkout -b gh-pages
-          mv index.html docs/index.html
-          git add docs
-          git commit -m'Update OpenAPI docs for GitHub pages'
-          git push --set-upstream origin gh-pages

.github/workflows/release.yml

@@ -1,46 +0,0 @@
-name: Release chart package
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  helm-package:
-    runs-on: ubuntu-20.04
-    env:
-      HELM_REPO_URL: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
-      HELM_REPO_USERNAME: ucentral
-    steps:
-      - name: Checkout uCentral assembly chart repo
-        uses: actions/checkout@v3
-        with:
-          path: wlan-cloud-ucentralsec
-
-      - name: Build package
-        working-directory: wlan-cloud-ucentralsec/helm
-        run: |
-          helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0
-          helm repo add bitnami https://charts.bitnami.com/bitnami
-          helm repo update
-          helm dependency update
-          mkdir dist
-          helm package . -d dist
-
-      - name: Generate GitHub release body
-        working-directory: wlan-cloud-ucentralsec/helm
-        run: |
-          pip3 install yq -q
-          echo "Docker image - tip-tip-wlan-cloud-ucentral.jfrog.io/owsec:$GITHUB_REF_NAME" > release.txt
-          echo "Helm charted may be attached to this release" >> release.txt
-          echo "Deployment artifacts may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/$GITHUB_REF_NAME" >> release.txt
-
-      - name: Create GitHub release
-        uses: softprops/action-gh-release@v1
-        with:
-          body_path: wlan-cloud-ucentralsec/helm/release.txt
-          files: wlan-cloud-ucentralsec/helm/dist/*

.gitignore

@@ -18,4 +18,3 @@ _deps
 *.csr
 /cmake-build/
 /smake-build-debug/
-test_scripts/curl/result.json

.idea/.gitignore

@@ -0,0 +1,21 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+/certs/
+/logs/
+*.csr
+*.db
+/docker-compose/certs/
+/docker-compose/*-data/data/
+/docker-compose/*-data/uploads/
+/docker-compose/.env
+/docker-compose/.env_*
+/cmake-build/
+*.pem
+result.json
+token.json

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owsec VERSION 2.8.0)
+project(owsec VERSION 2.2.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -20,173 +20,71 @@ endif()
 
 # Auto build increment. You must define BUILD_INCREMENT with cmake -DBUILD_INCREMENT=1
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build)
-    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/build BUILD_NUM)
+    file(READ build BUILD_NUM)
     if(BUILD_INCREMENT)
         MATH(EXPR BUILD_NUM "${BUILD_NUM}+1")
-        file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
+        file(WRITE build ${BUILD_NUM})
     endif()
 else()
     set(BUILD_NUM 1)
-    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
+    file(WRITE build ${BUILD_NUM})
 endif()
 
-find_package(Git QUIET)
-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            RESULT_VARIABLE GIT_RESULT
-            OUTPUT_VARIABLE GIT_HASH)
-    if(NOT GIT_RESULT EQUAL "0")
-        message(FATAL_ERROR "git rev-parse --short HEAD failed with ${GIT_RESULT}")
-    endif()
-    string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
-endif()
-
-add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
-
 set(BUILD_SHARED_LIBS 1)
 
+add_definitions(-DAPP_VERSION="${CMAKE_PROJECT_VERSION}" -DBUILD_NUMBER="${BUILD_NUM}")
 add_definitions(-DTIP_SECURITY_SERVICE="1")
-add_definitions(-DPOCO_LOG_DEBUG="1")
-
-add_compile_options(-Wall -Wextra)
-if(ASAN)
-    add_compile_options(-fsanitize=address)
-    add_link_options(-fsanitize=address)
-endif()
 
+set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
+find_package(Boost REQUIRED system)
 find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(fmt  REQUIRED)
-find_package(AWSSDK     REQUIRED COMPONENTS sns)
-find_package(nlohmann_json  REQUIRED)
+
 find_package(CppKafka REQUIRED)
 find_package(PostgreSQL REQUIRED)
 find_package(MySQL REQUIRED)
 find_package(Poco REQUIRED COMPONENTS JSON Crypto JWT Net Util NetSSL Data DataSQLite DataPostgreSQL DataMySQL)
 
-include_directories(/usr/local/include  /usr/local/opt/openssl/include src include/kafka /usr/local/opt/mysql-client/include)
-
-configure_file(src/ow_version.h.in ${PROJECT_SOURCE_DIR}/src/ow_version.h @ONLY)
-
 add_executable( owsec
-        build
-        src/ow_version.h.in
-        src/framework/CountryCodes.h
-        src/framework/KafkaTopics.h
-        src/framework/MicroService.h
-        src/framework/OpenWifiTypes.h
-        src/framework/orm.h
-        src/framework/StorageClass.h
-        src/framework/MicroServiceErrorHandler.h
-        src/framework/UI_WebSocketClientServer.cpp
-        src/framework/UI_WebSocketClientServer.h
-        src/framework/UI_WebSocketClientNotifications.cpp
-        src/framework/UI_WebSocketClientNotifications.h
-        src/framework/utils.h
-        src/framework/utils.cpp
-        src/framework/AppServiceRegistry.h
-        src/framework/SubSystemServer.cpp
-        src/framework/SubSystemServer.h
-        src/framework/RESTAPI_utils.h
-        src/framework/AuthClient.cpp
-        src/framework/AuthClient.h
-        src/framework/MicroServiceNames.h
-        src/framework/MicroServiceFuncs.h
-        src/framework/OpenAPIRequests.cpp
-        src/framework/OpenAPIRequests.h
-        src/framework/MicroServiceFuncs.cpp
-        src/framework/ALBserver.cpp
-        src/framework/ALBserver.h
-        src/framework/KafkaManager.cpp
-        src/framework/KafkaManager.h
-        src/framework/RESTAPI_RateLimiter.h
-        src/framework/WebSocketLogger.h
-        src/framework/RESTAPI_GenericServerAccounting.h
-        src/framework/RESTAPI_SystemConfiguration.h
-        src/framework/CIDR.h
-        src/framework/RESTAPI_Handler.cpp
-        src/framework/RESTAPI_Handler.h
-        src/framework/RESTAPI_ExtServer.h
-        src/framework/RESTAPI_ExtServer.cpp
-        src/framework/RESTAPI_IntServer.cpp
-        src/framework/RESTAPI_IntServer.h
-        src/framework/RESTAPI_SystemCommand.h
-        src/framework/RESTAPI_WebSocketServer.h
-        src/framework/EventBusManager.cpp
-        src/framework/EventBusManager.h
-        src/framework/RESTAPI_PartHandler.h
-        src/framework/MicroService.cpp
-        src/framework/MicroServiceExtra.h
-
-        src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
-        src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
-        src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
-        src/RESTObjects/RESTAPI_CertObjects.cpp src/RESTObjects/RESTAPI_CertObjects.h
-        src/RESTObjects/RESTAPI_OWLSobjects.cpp src/RESTObjects/RESTAPI_OWLSobjects.h
-        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
-        src/RESTObjects/RESTAPI_AnalyticsObjects.cpp src/RESTObjects/RESTAPI_AnalyticsObjects.h
-        src/RESTObjects/RESTAPI_SubObjects.cpp src/RESTObjects/RESTAPI_SubObjects.h
-
-        src/seclibs/qrcode/qrcodegen.hpp src/seclibs/qrcode/qrcodegen.cpp
-        src/seclibs/cpptotp/bytes.cpp src/seclibs/cpptotp/bytes.h
-        src/seclibs/cpptotp/otp.cpp src/seclibs/cpptotp/otp.h
-        src/seclibs/cpptotp/sha1.cpp src/seclibs/cpptotp/sha1.h
-        src/RESTAPI/RESTAPI_oauth2_handler.h src/RESTAPI/RESTAPI_oauth2_handler.cpp
-        src/RESTAPI/RESTAPI_users_handler.cpp src/RESTAPI/RESTAPI_users_handler.h
-        src/RESTAPI/RESTAPI_user_handler.cpp src/RESTAPI/RESTAPI_user_handler.h
-        src/RESTAPI/RESTAPI_action_links.cpp src/RESTAPI/RESTAPI_action_links.h
-        src/RESTAPI/RESTAPI_validate_token_handler.cpp src/RESTAPI/RESTAPI_validate_token_handler.h
-        src/RESTAPI/RESTAPI_system_endpoints_handler.cpp src/RESTAPI/RESTAPI_system_endpoints_handler.h
-        src/RESTAPI/RESTAPI_asset_server.cpp src/RESTAPI/RESTAPI_asset_server.h
-        src/RESTAPI/RESTAPI_avatar_handler.cpp src/RESTAPI/RESTAPI_avatar_handler.h
-        src/RESTAPI/RESTAPI_subavatar_handler.cpp src/RESTAPI/RESTAPI_subavatar_handler.h
-        src/RESTAPI/RESTAPI_email_handler.cpp src/RESTAPI/RESTAPI_email_handler.h
-        src/RESTAPI/RESTAPI_sms_handler.cpp src/RESTAPI/RESTAPI_sms_handler.h
-        src/RESTAPI/RESTAPI_suboauth2_handler.h src/RESTAPI/RESTAPI_suboauth2_handler.cpp
-        src/RESTAPI/RESTAPI_subuser_handler.h src/RESTAPI/RESTAPI_subuser_handler.cpp
-        src/RESTAPI/RESTAPI_subusers_handler.h src/RESTAPI/RESTAPI_subusers_handler.cpp
-        src/RESTAPI/RESTAPI_validate_sub_token_handler.cpp src/RESTAPI/RESTAPI_validate_sub_token_handler.h
-        src/RESTAPI/RESTAPI_submfa_handler.cpp src/RESTAPI/RESTAPI_submfa_handler.h
-        src/RESTAPI/RESTAPI_preferences.cpp src/RESTAPI/RESTAPI_preferences.h
-        src/RESTAPI/RESTAPI_subpreferences.cpp src/RESTAPI/RESTAPI_subpreferences.h
-        src/RESTAPI/RESTAPI_routers.cpp
-        src/Daemon.h src/Daemon.cpp
-        src/SpecialUserHelpers.h
-        src/AuthService.h src/AuthService.cpp
-        src/StorageService.cpp src/StorageService.h
-        src/SMTPMailerService.cpp src/SMTPMailerService.h
-        src/SMSSender.cpp src/SMSSender.h
-        src/MFAServer.cpp src/MFAServer.h
-        src/SMS_provider_aws.cpp src/SMS_provider_aws.h
-        src/SMS_provider.cpp src/SMS_provider.h
-        src/SMS_provider_twilio.cpp src/SMS_provider_twilio.h
-        src/ActionLinkManager.cpp src/ActionLinkManager.h
-        src/ACLProcessor.h
-        src/storage/orm_users.cpp src/storage/orm_users.h
-        src/storage/orm_tokens.cpp src/storage/orm_tokens.h
-        src/storage/orm_preferences.cpp src/storage/orm_preferences.h
-        src/storage/orm_actionLinks.cpp src/storage/orm_actionLinks.h
-        src/storage/orm_avatar.cpp src/storage/orm_avatar.h
-        src/SpecialUserHelpers.h
-        src/RESTAPI/RESTAPI_db_helpers.h src/storage/orm_logins.cpp src/storage/orm_logins.h
-        src/RESTAPI/RESTAPI_totp_handler.cpp
-        src/RESTAPI/RESTAPI_totp_handler.h
-        src/TotpCache.h
-        src/RESTAPI/RESTAPI_subtotp_handler.cpp src/RESTAPI/RESTAPI_subtotp_handler.h
-        src/RESTAPI/RESTAPI_signup_handler.cpp src/RESTAPI/RESTAPI_signup_handler.h
-        src/MessagingTemplates.cpp src/MessagingTemplates.h src/RESTAPI/RESTAPI_apiKey_handler.cpp src/RESTAPI/RESTAPI_apiKey_handler.h src/storage/orm_apikeys.cpp src/storage/orm_apikeys.h src/RESTAPI/RESTAPI_validate_apikey.cpp src/RESTAPI/RESTAPI_validate_apikey.h)
+                build
+                src/Daemon.h src/Daemon.cpp
+                src/MicroService.cpp src/MicroService.h
+                src/SubSystemServer.cpp src/SubSystemServer.h
+                src/RESTAPI_oauth2Handler.h src/RESTAPI_oauth2Handler.cpp
+                src/RESTAPI_handler.h src/RESTAPI_handler.cpp
+                src/RESTAPI_server.cpp src/RESTAPI_server.h
+                src/RESTAPI_SecurityObjects.cpp src/RESTAPI_SecurityObjects.h
+                src/RESTAPI_system_command.h src/RESTAPI_system_command.cpp
+                src/RESTAPI_protocol.h
+                src/AuthService.h src/AuthService.cpp
+                src/KafkaManager.h src/KafkaManager.cpp
+                src/StorageService.cpp src/StorageService.h
+                src/Utils.cpp src/Utils.h
+                src/storage_setup.cpp
+                src/storage_tables.cpp src/SMTPMailerService.cpp src/SMTPMailerService.h
+                src/RESTAPI_users_handler.cpp src/RESTAPI_users_handler.h
+                src/RESTAPI_user_handler.cpp src/RESTAPI_user_handler.h
+                src/RESTAPI_action_links.cpp src/RESTAPI_action_links.h src/storage_users.cpp
+                src/RESTAPI_InternalServer.cpp src/RESTAPI_InternalServer.h
+                src/RESTAPI_validateToken_handler.cpp src/RESTAPI_validateToken_handler.h
+                src/RESTAPI_systemEndpoints_handler.cpp src/RESTAPI_systemEndpoints_handler.h
+                src/RESTAPI_AssetServer.cpp src/RESTAPI_AssetServer.h
+                src/RESTAPI_avatarHandler.cpp src/RESTAPI_avatarHandler.h
+                src/storage_avatar.cpp src/storage_avatar.h src/storage_users.h
+                src/OpenWifiTypes.h src/RESTAPI_email_handler.cpp src/RESTAPI_email_handler.h
+                src/storage_tokens.cpp
+                src/RESTAPI_GenericServer.h src/RESTAPI_GenericServer.cpp
+                src/RESTAPI_errors.h
+                )
 
 if(NOT SMALL_BUILD)
     target_link_libraries(owsec PUBLIC
-            ${Poco_LIBRARIES}
-            ${MySQL_LIBRARIES}
-            ${ZLIB_LIBRARIES}
+            ${Poco_LIBRARIES} ${Boost_LIBRARIES} ${MySQL_LIBRARIES}  ${ZLIB_LIBRARIES}
             CppKafka::cppkafka
-            ${AWSSDK_LINK_LIBRARIES}
-            fmt::fmt
             )
     if(UNIX AND NOT APPLE)
         target_link_libraries(owsec PUBLIC PocoJSON)
     endif()
-endif()
+endif()

Dockerfile

@@ -1,35 +1,16 @@
-ARG DEBIAN_VERSION=11.5-slim
-ARG POCO_VERSION=poco-tip-v2
-ARG CPPKAFKA_VERSION=tip-v1
+FROM alpine AS builder
 
-FROM debian:$DEBIAN_VERSION AS build-base
+RUN apk add --update --no-cache \
+    openssl openssh \
+    ncurses-libs \
+    bash util-linux coreutils curl \
+    make cmake gcc g++ libstdc++ libgcc git zlib-dev \
+    openssl-dev boost-dev unixodbc-dev postgresql-dev mariadb-dev \
+    apache2-utils yaml-dev apr-util-dev \
+    librdkafka-dev
 
-RUN apt-get update && apt-get install --no-install-recommends -y \
-    make cmake g++ git curl zip unzip pkg-config \
-    libpq-dev libmariadb-dev libmariadbclient-dev-compat \
-    librdkafka-dev libboost-all-dev libssl-dev \
-    zlib1g-dev ca-certificates libcurl4-openssl-dev libfmt-dev
-
-FROM build-base AS poco-build
-
-ARG POCO_VERSION
-
-ADD https://api.github.com/repos/AriliaWireless/poco/git/refs/tags/${POCO_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/poco --branch ${POCO_VERSION} /poco
-
-WORKDIR /poco
-RUN mkdir cmake-build
-WORKDIR cmake-build
-RUN cmake ..
-RUN cmake --build . --config Release -j8
-RUN cmake --build . --target install
-
-FROM build-base AS cppkafka-build
-
-ARG CPPKAFKA_VERSION
-
-ADD https://api.github.com/repos/AriliaWireless/cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka
+RUN git clone https://github.com/stephb9959/poco /poco
+RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
 
 WORKDIR /cppkafka
 RUN mkdir cmake-build
@@ -38,65 +19,44 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install
 
-FROM build-base AS owsec-build
+WORKDIR /poco
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake ..
+RUN cmake --build . --config Release -j8
+RUN cmake --build . --target install
 
 ADD CMakeLists.txt build /owsec/
-ADD overlays /owsec/overlays
 ADD cmake /owsec/cmake
 ADD src /owsec/src
-ADD .git /owsec/.git
-ARG VCPKG_VERSION=2022.11.14
-RUN git clone --depth 1 --branch ${VCPKG_VERSION} https://github.com/microsoft/vcpkg && \
-    ./vcpkg/bootstrap-vcpkg.sh && \
-    mkdir /vcpkg/custom-triplets && \
-    cp /vcpkg/triplets/x64-linux.cmake /vcpkg/custom-triplets/x64-linux.cmake && \
-    sed -i 's/set(VCPKG_LIBRARY.*/set(VCPKG_LIBRARY_LINKAGE dynamic)/g' /vcpkg/custom-triplets/x64-linux.cmake && \
-    ./vcpkg/vcpkg install aws-sdk-cpp[sns]:x64-linux json-schema-validator:x64-linux --overlay-triplets=/vcpkg/custom-triplets --overlay-ports=/owsec/overlays
-
-COPY --from=poco-build /usr/local/include /usr/local/include
-COPY --from=poco-build /usr/local/lib /usr/local/lib
-COPY --from=cppkafka-build /usr/local/include /usr/local/include
-COPY --from=cppkafka-build /usr/local/lib /usr/local/lib
 
 WORKDIR /owsec
 RUN mkdir cmake-build
 WORKDIR /owsec/cmake-build
-RUN cmake -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+RUN cmake ..
 RUN cmake --build . --config Release -j8
 
-FROM debian:$DEBIAN_VERSION
+FROM alpine
 
 ENV OWSEC_USER=owsec \
     OWSEC_ROOT=/owsec-data \
     OWSEC_CONFIG=/owsec-data
 
-RUN useradd "$OWSEC_USER"
+RUN addgroup -S "$OWSEC_USER" && \
+    adduser -S -G "$OWSEC_USER" "$OWSEC_USER"
 
 RUN mkdir /openwifi
 RUN mkdir -p "$OWSEC_ROOT" "$OWSEC_CONFIG" && \
     chown "$OWSEC_USER": "$OWSEC_ROOT" "$OWSEC_CONFIG"
+RUN apk add --update --no-cache librdkafka mariadb-connector-c libpq unixodbc su-exec gettext ca-certificates
+COPY --from=builder /owsec/cmake-build/owsec /openwifi/owsec
+COPY --from=builder /cppkafka/cmake-build/src/lib/* /lib/
+COPY --from=builder /poco/cmake-build/lib/* /lib/
 
-RUN apt-get update && apt-get install --no-install-recommends -y \
-    librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
-    libmariadb-dev-compat libpq5 postgresql-client libfmt7
-
-COPY readiness_check /readiness_check
-COPY test_scripts/curl/cli /cli
-
-COPY owsec.properties.tmpl /
-COPY wwwassets /dist/wwwassets
-COPY templates /dist/templates
+COPY owsec.properties.tmpl ${OWSEC_CONFIG}/
 COPY docker-entrypoint.sh /
-COPY wait-for-postgres.sh /
 RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentral-deploy/main/docker-compose/certs/restapi-ca.pem \
-    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.crt
-
-COPY --from=owsec-build /owsec/cmake-build/owsec /openwifi/owsec
-COPY --from=owsec-build /vcpkg/installed/x64-linux/lib/ /usr/local/lib/
-COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/ /usr/local/lib/
-COPY --from=poco-build /poco/cmake-build/lib/ /usr/local/lib/
-
-RUN ldconfig
+    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.pem
 
 EXPOSE 16001 17001 16101
 

OPERATOR.md

@@ -1,37 +0,0 @@
-# Operator Support
-In order to support multiple tenants and operators, you must prepare the security service to serve
-customized e-mails and messages.
-
-## Structure for `templates`
-Any file in the root of the directory will be used as defaults. The following files must be present:
-- email_invitation.html/txt : This email message will be sent to a newly added user. 
-- email_verification.html/txt : This email is sent when an email verification is required.
-- password_reset.html/txt : This is sent when a pasword reset is requested.
-- verification_code.html/txt : This is used during MFA when email based.
-- signup_verification.html/txt : This email is send to a new subscriber who signed up for service.
-- sub_email_verification.html/txt : This is sent to a subscriber requiring an email verification.
-- sub_verification_code.html/txt : This is used during MFA when email based for a subscriber.
-- logo.jpg : The default logo to use in any of these emails.
-
-## Structure for `wwwassets`
-Any file in the root of the directory will be used as defaults. The following files must be present:
-- email_verification_error.html : Used when email verification has failed.
-- email_verification_success.html : Used when emil verification has succeeded.
-- invitation_error.html :
-- invitation_success.html :
-- password_policy.html :
-- password_reset.html :
-- password_reset_success.html :
-- password_reset_error.html :
-- signup_verification.html :
-- signup_verification_error.html :
-- signup_verification_success.html :
-- favicon.ico : icon for the application
-- 404_error.html : your customized 404 page
-- the_logo : the logo to use.
-
-## For tenants
-When creating a tenant/operator, you must create a subdirectory inside each `wwwassets` and `templates` and replicate 
-all the files that appear at the root level. You need to use the short Operator name (also known as RegistrantId in the API). This means 
-no spaces, all lowercase characters and numbers. No special characters: 0-9 and a-z. 
-

README.md

@@ -13,12 +13,12 @@ into your own systems. If all you need it to access the uCentralGW for example (
 - choose one to manage (pick an endpoint that matches what you are trying to do by looking at its `type`. For the gateway, type = ucentrtalgw)
 - make your calls (use the PublicEndPoint of the corresponding entry to make your calls, do not forget to add `/api/v1` as the root os the call)
 
-The CLI for the [uCentralGW](https://github.com/telecominfraproject/wlan-cloud-ucentralgw/blob/main/test_scripts/curl/cli) has a very good example of this. 
-Look for the `setgateway` function.
+The CLI for the [uCentralGW](https://github.com/telecominfraproject/wlan-cloud-ucentralgw/blob/main/test_scripts/curl/cli) has a very good example of this. Loog for the `setgateway` 
+function.
 
 ## Firewall Considerations
 The entire uCentral systems uses several MicroServices. In order for the whole system to work, you should provide the following port
-access:
+access
 
 - Security
   - Properties file: owsec.properties
@@ -28,21 +28,14 @@ access:
     - ALB: 16101
 
 - Gateway:
-  - Properties file: owgw.properties
+  - Properties file: ucentralgw.properties
   - Ports
     - Public: 16002
     - Private: 17002
     - ALB: 16102
 
 - Firmware:
-  - Properties file: owfms.properties
-  - Ports
-    - Public: 16004
-    - Private: 17004
-    - ALB: 16104
-
-- Provisioning:
-  - Properties file: owprov.properties
+  - Properties file: ucentralfms.properties
   - Ports
     - Public: 16004
     - Private: 17004
@@ -86,6 +79,7 @@ Is this safe to show the hash in a text file? Let me put it this way, if you can
 would have control over the entire internet. It's incredibly safe. If you love math, you can find a lot of videos explaining
 how hashes work and why they are safe.
 
+
 ### `authentication.validation.expression`
 This is a regular expression (regex) to verify the incoming password. You can find many examples on the internet on how to create these expressions. I suggest 
 that using Google is your friend. Someone has figured out what you want to do already. Click [here](https://stackoverflow.com/questions/19605150/regex-for-password-must-contain-at-least-eight-characters-at-least-one-number-a)
@@ -98,45 +92,11 @@ to get a sample. The default is
 ### `authentication.oldpasswords`
 The number of older passwords to keep. Default is 5.
 
-### Changing default password
-
-On the first startup of the service new user will be created with the default credentials from properties `authentication.default.username` and `authentication.default.password`, but **you will have to change the password** before making any real requests.
-
-You can this using [owgw-ui](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui/) on first login or using the following script:
-
-```
-export OWSEC=openwifi.wlan.local:16001 # endpoint to your owsec RESTAPI endpoint
-#export FLAGS="-k" # uncomment and add curl flags that you would like to pass for the request (for example '-k' may be used to pass errors with self-signed certificates)
-export OWSEC_DEFAULT_USERNAME=root@system.com # default username that you've set in property 'authentication.default.username'
-export OWSEC_DEFAULT_PASSWORD=weLoveWifi # default password __in cleartext__ from property 'authentication.default.password'
-export OWSEC_NEW_PASSWORD=NewPass123% # new password that must be set for the user (must comply with 'authentication.validation.expression')
-test_scripts/curl/cli testlogin $OWSEC_DEFAULT_USERNAME $OWSEC_DEFAULT_PASSWORD $OWSEC_NEW_PASSWORD
-```
-
-CLI is also included in Docker image if you want to run it this way:
-
-```
-export OWSEC=openwifi.wlan.local:16001
-#export FLAGS="-k"
-export OWSEC_DEFAULT_USERNAME=root@system.com
-export OWSEC_DEFAULT_PASSWORD=weLoveWifi
-export OWSEC_NEW_PASSWORD=NewPass123%
-docker run --rm -ti \
-  --network=host \
-  --env OWSEC \
-  --env FLAGS \
-  --env OWSEC_DEFAULT_USERNAME \
-  --env OWSEC_DEFAULT_PASSWORD \
-  --env OWSEC_NEW_PASSWORD \
-  tip-tip-wlan-cloud-ucentral.jfrog.io/owsec:main \
-  /cli testlogin $OWSEC_DEFAULT_USERNAME $OWSEC_DEFAULT_PASSWORD $OWSEC_NEW_PASSWORD
-```
-
 ### Kafka integration
 This security service uses Kafka to coordinate security with other services that are part of the system. You must have a Kafka service running
 in order to use this. You can find several examples of Kafka services available with Docker. Here are the values you need to configure.
 
-```
+```asm
 openwifi.kafka.group.id = security
 openwifi.kafka.client.id = security1
 openwifi.kafka.enable = true
@@ -166,7 +126,7 @@ Here are the parameters for the public interface. The important files are:
 - `restapi-key.pem` : the key associated with this certificate
 - `openwifi.restapi.host.0.key.password` : if you key is password protected, you may supply that password here.
 
-```
+```asm
 openwifi.restapi.host.0.backlog = 100
 openwifi.restapi.host.0.security = relaxed
 openwifi.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem
@@ -181,7 +141,7 @@ openwifi.restapi.host.0.key.password = mypassword
 The private interface is used for service-to-service communication. You can use self-signed certificates here or letsencrypt. The file names are similar 
 to the filenames used in the previous section.
 
-```
+```asm
 openwifi.internal.restapi.host.0.backlog = 100
 openwifi.internal.restapi.host.0.security = relaxed
 openwifi.internal.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem
@@ -196,15 +156,14 @@ openwifi.internal.restapi.host.0.key.password = mypassword
 Here are other important values you must set.
 
 
-```
+```asm
 openwifi.system.data = $OWSEC_ROOT/data
 openwifi.system.uri.private = https://localhost:17001
 openwifi.system.uri.public = https://openwifi.dpaas.arilia.com:16001
-openwifi.system.uri.ui = https://ucentral-ui.arilia.com
 openwifi.system.commandchannel = /tmp/app.ucentralsec
 openwifi.service.key = $OWSEC_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
 ```
+
 #### `openwifi.system.data`
 The location of some important data files including the user name database.
 
@@ -214,54 +173,3 @@ This is the FQDN used internally between services.
 #### `openwifi.system.uri.public`
 This is the FQDN used externally serving the OpenAPI interface.
 
-### Sending SMS for Multifactor Aithentication
-`owsec` hs the ability to send SMS messages to users during login or to send notifications. In order to do so,
-an SMS provider must be configured. At present time, 2 providers are supported: Tilio and AWS SNS
-
-#### AWS SMS
-For SNS you must create an IAM ID that has sns:sendmessage rights.  
-
-```
-smssender.enabled = true
-smssender.provider = aws
-smssender.aws.secretkey = ***************************************
-smssender.aws.accesskey = ***************************************
-smssender.aws.region = **************
-```
-
-#### Twilio
-For Twilio, you must provide the following
-
-```
-smssender.enabled = true
-smssender.provider = twilio
-smssender.twilio.sid = ***********************
-smssender.twilio.token = **********************
-smssender.twilio.phonenumber = +18888888888
-```
-
-### `owsec` Messaging Configuration
-`owsec` nay require to send e-mails. In order to do so, you must configure an email sender. We have run tests 
-with GMail and AWS SES. For each, you must obtain the proper credentials and insert them in this configuration as well
-as the proper mail host.
-
-```
-mailer.enabled = true
-mailer.hostname = smtp.gmail.com
-mailer.username = ************************
-mailer.password = ************************
-mailer.sender = OpenWIFI
-mailer.loginmethod = login
-mailer.port = 587
-mailer.templates = $OWSEC_ROOT/templates
-```
-
-#### Google Authenticator
-In order to use the Google Time-based One-Time Password (TOTP), the user must download the Google Authenticator 
-on any other app that support the TOTP protocol. You should include the following in your configuration
-
-```
-totp.issuer = OrgName
-```
-
-It is very important that you not use spaces in your OrgName.

build

@@ -1 +1 @@
-33
+29

docker-entrypoint.sh

@@ -1,17 +1,17 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 if [ "$SELFSIGNED_CERTS" = 'true' ]; then
     update-ca-certificates
 fi
 
-if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
+if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWSEC_CONFIG"/owsec.properties ]]; then
   RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\$OWSEC_ROOT/certs/restapi-ca.pem"} \
   RESTAPI_HOST_PORT=${RESTAPI_HOST_PORT:-"16001"} \
   RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\$OWSEC_ROOT/certs/restapi-cert.pem"} \
   RESTAPI_HOST_KEY=${RESTAPI_HOST_KEY:-"\$OWSEC_ROOT/certs/restapi-key.pem"} \
   RESTAPI_HOST_KEY_PASSWORD=${RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-  RESTAPI_WWWASSETS=${RESTAPI_WWWASSETS:-"\$OWSEC_ROOT/persist/wwwassets"} \
+  RESTAPI_WWWASSETS=${RESTAPI_WWWASSETS:-"\$OWSEC_ROOT/wwwassets"} \
   INTERNAL_RESTAPI_HOST_ROOTCA=${INTERNAL_RESTAPI_HOST_ROOTCA:-"\$OWSEC_ROOT/certs/restapi-ca.pem"} \
   INTERNAL_RESTAPI_HOST_PORT=${INTERNAL_RESTAPI_HOST_PORT:-"17001"} \
   INTERNAL_RESTAPI_HOST_CERT=${INTERNAL_RESTAPI_HOST_CERT:-"\$OWSEC_ROOT/certs/restapi-cert.pem"} \
@@ -23,32 +23,15 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   SYSTEM_URI_PRIVATE=${SYSTEM_URI_PRIVATE:-"https://localhost:17001"} \
   SYSTEM_URI_PUBLIC=${SYSTEM_URI_PUBLIC:-"https://localhost:16001"} \
   SYSTEM_URI_UI=${SYSTEM_URI_UI:-"http://localhost"} \
-  SECURITY_RESTAPI_DISABLE=${SECURITY_RESTAPI_DISABLE:-"false"} \
   SERVICE_KEY=${SERVICE_KEY:-"\$OWSEC_ROOT/certs/restapi-key.pem"} \
   SERVICE_KEY_PASSWORD=${SERVICE_KEY_PASSWORD:-"mypassword"} \
-  SMSSENDER_ENABLED=${SMSSENDER_ENABLED:-"false"} \
-  SMSSENDER_PROVIDER=${SMSSENDER_PROVIDER:-""} \
-  SMSSENDER_AWS_SECRETKEY=${SMSSENDER_AWS_SECRETKEY:-""} \
-  SMSSENDER_AWS_ACCESSKEY=${SMSSENDER_AWS_ACCESSKEY:-""} \
-  SMSSENDER_AWS_REGION=${SMSSENDER_AWS_REGION:-""} \
-  SMSSENDER_TWILIO_SID=${SMSSENDER_TWILIO_SID:-""} \
-  SMSSENDER_TWILIO_TOKEN=${SMSSENDER_TWILIO_TOKEN:-""} \
-  SMSSENDER_TWILIO_PHONENUMBER=${SMSSENDER_TWILIO_PHONENUMBER:-""} \
-  MAILER_ENABLED=${MAILER_ENABLED:-"false"} \
-  MAILER_HOSTNAME=${MAILER_HOSTNAME:-"localhost"} \
-  MAILER_USERNAME=${MAILER_USERNAME:-""} \
-  MAILER_PASSWORD=${MAILER_PASSWORD:-""} \
+  MAILER_HOSTNAME=${MAILER_HOSTNAME:-"smtp.gmail.com"} \
+  MAILER_USERNAME=${MAILER_USERNAME:-"************************"} \
+  MAILER_PASSWORD=${MAILER_PASSWORD:-"************************"} \
   MAILER_SENDER=${MAILER_SENDER:-"OpenWIFI"} \
   MAILER_PORT=${MAILER_PORT:-"587"} \
-  MAILER_TEMPLATES=${MAILER_TEMPLATES:-"\$OWSEC_ROOT/persist/templates"} \
   KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
   KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
-  KAFKA_SSL_CA_LOCATION=${KAFKA_SSL_CA_LOCATION:-""} \
-  KAFKA_SSL_CERTIFICATE_LOCATION=${KAFKA_SSL_CERTIFICATE_LOCATION:-""} \
-  KAFKA_SSL_KEY_LOCATION=${KAFKA_SSL_KEY_LOCATION:-""} \
-  KAFKA_SSL_KEY_PASSWORD=${KAFKA_SSL_KEY_PASSWORD:-""} \
-  DOCUMENT_POLICY_ACCESS=${DOCUMENT_POLICY_ACCESS:-"\$OWSEC_ROOT/persist/wwwassets/access_policy.html"} \
-  DOCUMENT_POLICY_PASSWORD=${DOCUMENT_POLICY_PASSWORD:-"\$OWSEC_ROOT/persist/wwwassets/password_policy.html"} \
   STORAGE_TYPE=${STORAGE_TYPE:-"sqlite"} \
   STORAGE_TYPE_POSTGRESQL_HOST=${STORAGE_TYPE_POSTGRESQL_HOST:-"localhost"} \
   STORAGE_TYPE_POSTGRESQL_USERNAME=${STORAGE_TYPE_POSTGRESQL_USERNAME:-"owsec"} \
@@ -60,32 +43,14 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owsec"} \
   STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owsec"} \
   STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-  envsubst < /owsec.properties.tmpl > $OWSEC_CONFIG/owsec.properties
-fi
-
-# Check if wwwassets directory exists
-export RESTAPI_WWWASSETS=$(grep 'openwifi.restapi.wwwassets' $OWSEC_CONFIG/owsec.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-if [[ ! -d "$(dirname $RESTAPI_WWWASSETS)" ]]; then
-  mkdir -p $(dirname $RESTAPI_WWWASSETS)
-fi
-if [[ ! -d "$RESTAPI_WWWASSETS" ]]; then
-  cp -r /dist/wwwassets $RESTAPI_WWWASSETS
-fi
-
-# Check if templates directory exists
-export MAILER_TEMPLATES=$(grep 'mailer.templates' $OWSEC_CONFIG/owsec.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-if [[ ! -d "$(dirname $MAILER_TEMPLATES)" ]]; then
-  mkdir -p $(dirname $MAILER_TEMPLATES)
-fi
-if [[ ! -d "$MAILER_TEMPLATES" ]]; then
-  cp -r /dist/templates $MAILER_TEMPLATES
+  envsubst < $OWSEC_CONFIG/owsec.properties.tmpl > $OWSEC_CONFIG/owsec.properties
 fi
 
 if [ "$1" = '/openwifi/owsec' -a "$(id -u)" = '0' ]; then
     if [ "$RUN_CHOWN" = 'true' ]; then
       chown -R "$OWSEC_USER": "$OWSEC_ROOT" "$OWSEC_CONFIG"
     fi
-    exec gosu "$OWSEC_USER" "$@"
+    exec su-exec "$OWSEC_USER" "$@"
 fi
 
 exec "$@"

helm/.gitignore

@@ -1,3 +1 @@
 *.swp
-Chart.lock
-charts/

helm/Chart.yaml

@@ -5,14 +5,14 @@ name: owsec
 version: 0.1.0
 dependencies:
 - name: postgresql
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
   version: 10.9.2
   condition: postgresql.enabled
 - name: mysql
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
   version: 8.8.3
   condition: mysql.enabled
 - name: mariadb
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
   version: 9.4.2
   condition: mariadb.enabled

helm/README.md

@@ -20,7 +20,7 @@ Currently this chart is not assembled in charts archives, so [helm-git](https://
 To install the chart with the release name `my-release`:
 
 ```bash
-$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm/owsec-0.1.0.tgz?ref=main
+$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=main
 ```
 
 The command deploys the Security on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@@ -70,8 +70,8 @@ The following table lists the configurable parameters of the chart and their def
 | persistence.size | string | Defines PV size | `'10Gi'` |
 | public_env_variables | hash | Defines list of environment variables to be passed to the Security | |
 | configProperties | hash | Configuration properties that should be passed to the application in `owsec.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
-| existingCertsSecret | string | Existing Kubernetes secret containing all required certificates and private keys for microservice operation. If set, certificates from `certs` key are ignored | `""` |
-| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is adviced to be used) (see `volumes.owsec` on where it is mounted). If `existingCertsSecret` is set, certificates passed this way will not be used. |  |
+| certs | hash | Defines files (keys and certificates) that should be passed to the Security (PEM format is adviced to be used) (see `volumes.owsec` on where it is mounted) |  |
+
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

helm/templates/_helpers.tpl

@@ -30,13 +30,3 @@ Create chart name and version as used by the chart label.
 {{- define "owsec.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{- define "owsec.ingress.apiVersion" -}}
-  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
-      {{- print "networking.k8s.io/v1" -}}
-  {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
-    {{- print "networking.k8s.io/v1beta1" -}}
-  {{- else -}}
-    {{- print "extensions/v1beta1" -}}
-  {{- end -}}
-{{- end -}}

helm/templates/deployment.yaml

@@ -1,5 +1,4 @@
 {{- $root := . -}}
-{{- $storageType := index .Values.configProperties "storage.type" -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -14,7 +13,6 @@ spec:
   replicas: {{ .Values.replicaCount }}
   strategy:
     type: {{ .Values.strategyType }}
-  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "owsec.name" . }}
@@ -26,9 +24,6 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include "owsec.config" . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
       labels:
         app.kubernetes.io/name: {{ include "owsec.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
@@ -37,49 +32,6 @@ spec:
         {{- end }}
     spec:
 
-      initContainers:
-        - name: wait-kafka
-          image: "{{ .Values.images.dockerize.repository }}:{{ .Values.images.dockerize.tag }}"
-          imagePullPolicy: {{ .Values.images.dockerize.pullPolicy }}
-          args:
-            - -wait
-            - tcp://{{ index .Values.configProperties "openwifi.kafka.brokerlist" }}
-            - -timeout
-            - 600s
-
-{{- if eq $storageType "postgresql" }}
-        - name: wait-postgres
-          image: "{{ .Values.images.owsec.repository }}:{{ .Values.images.owsec.tag }}"
-          imagePullPolicy: {{ .Values.images.owsec.pullPolicy }}
-          command:
-            - /wait-for-postgres.sh
-            - {{ index .Values.configProperties "storage.type.postgresql.host" }}
-            - echo
-            - "PostgreSQL is ready"
-          env:
-            - name: KUBERNETES_DEPLOYED
-              value: "{{ now }}"
-          {{- range $key, $value := .Values.public_env_variables }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
-          {{- end }}
-          {{- range $key, $value := .Values.secret_env_variables }}
-            - name: {{ $key }}
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "owsec.fullname" $root }}-env
-                  key: {{ $key }}
-          {{- end }}
-          volumeMounts:
-          {{- range .Values.volumes.owsec }}
-          - name: {{ .name }}
-            mountPath: {{ .mountPath }}
-            {{- if .subPath }}
-            subPath: {{ .subPath }}
-            {{- end }}
-          {{- end }}
-{{- end }}
-
       containers:
 
         - name: owsec

helm/templates/ingress.yaml

@@ -2,7 +2,7 @@
 {{- range $ingress, $ingressValue := .Values.ingresses }}
 {{- if $ingressValue.enabled }}
 ---
-apiVersion: {{ include "owsec.ingress.apiVersion" $root }}
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ include "owsec.fullname" $root }}-{{ $ingress }}
@@ -36,23 +36,9 @@ spec:
       paths:
       {{- range $ingressValue.paths }}
         - path: {{ .path }}
-          {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-          pathType: {{ .pathType | default "ImplementationSpecific" }}
-          {{- end }}
           backend:
-            {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            service:
-              name: {{ include "owsec.fullname" $root }}-{{ .serviceName }}
-              port:
-              {{- if kindIs "string" .servicePort }}
-                name: {{ .servicePort }}
-              {{- else }}
-                number: {{ .servicePort }}
-              {{- end }}
-            {{- else }}
             serviceName: {{ include "owsec.fullname" $root }}-{{ .serviceName }}
             servicePort: {{ .servicePort }}
-            {{- end }}
       {{- end }}
   {{- end }}
 

helm/values.yaml

@@ -1,7 +1,6 @@
 # System
 replicaCount: 1
 strategyType: Recreate
-revisionHistoryLimit: 2
 
 nameOverride: ""
 fullnameOverride: ""
@@ -9,20 +8,16 @@ fullnameOverride: ""
 images:
   owsec:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owsec
-    tag: main
+    tag: v2.2.0-RC1
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
 #      username: username
 #      password: password
-  dockerize:
-    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/dockerize
-    tag: 0.16.0
-    pullPolicy: IfNotPresent
 
 services:
   owsec:
-    type: ClusterIP
+    type: LoadBalancer
     ports:
       restapi:
         servicePort: 16001
@@ -40,9 +35,9 @@ checks:
         path: /
         port: 16101
     readiness:
-      exec:
-        command:
-          - /readiness_check
+      httpGet:
+        path: /
+        port: 16101
 
 ingresses:
   restapi:
@@ -54,7 +49,6 @@ ingresses:
     - restapi.chart-example.local
     paths:
     - path: /
-      pathType: ImplementationSpecific
       serviceName: owsec
       servicePort: restapi
 
@@ -71,7 +65,7 @@ volumes:
       mountPath: /owsec-data/certs
       volumeDefinition: |
         secret:
-          secretName: {{ if .Values.existingCertsSecret }}{{ .Values.existingCertsSecret }}{{ else }}{{ include "owsec.fullname" . }}-certs{{ end }}
+          secretName: {{ include "owsec.fullname" . }}-certs
     # Change this if you want to use another volume type
     - name: persist
       mountPath: /owsec-data/persist
@@ -92,7 +86,7 @@ resources: {}
   #  memory: 128Mi
 
 securityContext:
-  fsGroup: 1000
+  fsGroup: 101
 
 nodeSelector: {}
 
@@ -100,8 +94,6 @@ tolerations: []
 
 affinity: {}
 
-podAnnotations: {}
-
 persistence:
   enabled: true
   # storageClassName: "-"
@@ -114,14 +106,8 @@ persistence:
 public_env_variables:
   OWSEC_ROOT: /owsec-data
   OWSEC_CONFIG: /owsec-data
-  # Environment variables required for the readiness checks using script
-  FLAGS: "-s --connect-timeout 3"
-  # NOTE in order for readiness check to use system info you need to set READINESS_METHOD to "systeminfo" and set OWSEC to the OWSEC's REST API endpoint
-  #READINESS_METHOD: systeminfo
 
-secret_env_variables:
-  OWSEC_USERNAME: tip@ucentral.com
-  OWSEC_PASSWORD: openwifi
+secret_env_variables: {}
 
 configProperties:
   # -> Public part
@@ -133,7 +119,7 @@ configProperties:
   openwifi.restapi.host.0.port: 16001
   openwifi.restapi.host.0.cert: $OWSEC_ROOT/certs/restapi-cert.pem
   openwifi.restapi.host.0.key: $OWSEC_ROOT/certs/restapi-key.pem
-  openwifi.restapi.wwwassets: $OWSEC_ROOT/persist/wwwassets
+  openwifi.restapi.wwwassets: $OWSEC_ROOT/wwwassets
   openwifi.internal.restapi.host.0.backlog: 100
   openwifi.internal.restapi.host.0.security: relaxed
   openwifi.internal.restapi.host.0.rootca: $OWSEC_ROOT/certs/restapi-ca.pem
@@ -146,17 +132,11 @@ configProperties:
   authentication.default.access: master
   authentication.service.type: internal
   # Mailer
-  mailer.enabled: "false"
   mailer.hostname: smtp.gmail.com
   mailer.sender: OpenWIFI
   mailer.loginmethod: login
   mailer.port: 587
-  mailer.templates: $OWSEC_ROOT/persist/templates
-  # SMS
-  smssender.enabled: "false"
-  smssender.provider: "aws"
-  #smssender.aws.region: ""
-  #smssender.twilio.phonenumber: ""
+  mailer.templates: $OWSEC_ROOT/templates
   # ALB
   alb.enable: "true"
   alb.port: 16101
@@ -167,10 +147,6 @@ configProperties:
   openwifi.kafka.brokerlist: localhost:9092
   openwifi.kafka.auto.commit: false
   openwifi.kafka.queue.buffering.max.ms: 50
-  openwifi.kafka.ssl.ca.location: ""
-  openwifi.kafka.ssl.certificate.location: ""
-  openwifi.kafka.ssl.key.location: ""
-  openwifi.kafka.ssl.key.password: ""
   # Storage
   storage.type: sqlite # (sqlite|postgresql|mysql|odbc)
   ## SQLite
@@ -200,9 +176,22 @@ configProperties:
   openwifi.system.uri.ui: https://localhost
   openwifi.system.commandchannel: /tmp/app_owsec
   # Logging
-  logging.type: console
-  logging.path: $OWSEC_ROOT/logs
-  logging.level: debug
+  logging.formatters.f1.class: PatternFormatter
+  logging.formatters.f1.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t"
+  logging.formatters.f1.times: UTC
+  logging.channels.c1.class: ConsoleChannel
+  logging.channels.c1.formatter: f1
+  logging.channels.c2.class: FileChannel
+  logging.channels.c2.path: /tmp/log_owsec
+  logging.channels.c2.formatter.class: PatternFormatter
+  logging.channels.c2.formatter.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t"
+  logging.channels.c2.rotation: "20 M"
+  logging.channels.c2.archive: timestamp
+  logging.channels.c2.purgeCount: 20
+  logging.channels.c3.class: ConsoleChannel
+  logging.channels.c3.pattern: "%s: [%p] %t"
+  logging.loggers.root.channel: c1
+  logging.loggers.root.level: debug
 
   # -> Secret part
   # REST API
@@ -214,12 +203,6 @@ configProperties:
   # Mailer
   mailer.username: no-reply@arilia.com
   mailer.password: "**************************"
-  # SMS
-  #smssender.aws.secretkey: ""
-  #smssender.aws.accesskey: ""
-  #smssender.twilio.sid: ""
-  #smssender.twilio.token: ""
-  #
   # Storage
   ## PostgreSQL
   storage.type.postgresql.username: stephb
@@ -228,9 +211,6 @@ configProperties:
   storage.type.mysql.username: stephb
   storage.type.mysql.password: snoopy99
 
-# NOTE: List of required certificates may be found in "certs" key. Alternative way to pass required certificates is to create external secret with all required certificates and set secret name in "existingCertsSecret" key. Details may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart#tldr
-existingCertsSecret: ""
-
 certs:
   # restapi-ca.pem: ""
   # restapi-cert.pem: ""

overlays/curl/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/curl/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "curl",
-    "version-string": "7.74.0-1.3+deb11u3"
-}

overlays/openssl/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/openssl/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "openssl",
-    "version-string": "1.1.1n-0+deb11u3"
-}

overlays/zlib/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/zlib/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "zlib",
-    "version-string": "1:1.2.11.dfsg-2+deb11u2"
-}

owsec.properties

@@ -36,26 +36,13 @@ openwifi.system.data = $OWSEC_ROOT/data
 openwifi.system.uri.private = https://localhost:17001
 openwifi.system.uri.public = https://local.dpaas.arilia.com:16001
 openwifi.system.uri.ui = https://ucentral-ui.arilia.com
-openwifi.security.restapi.disable = false
 openwifi.system.commandchannel = /tmp/app.ucentralsec
 openwifi.service.key = $OWSEC_ROOT/certs/restapi-key.pem
 openwifi.service.key.password = mypassword
 
-smssender.enabled = false
-smssender.provider = aws
-smssender.aws.secretkey = ***************************************
-smssender.aws.accesskey = ***************************************
-smssender.aws.region = **************
-
-#smssender.provider = twilio
-#smssender.twilio.sid = ***********************
-#smssender.twilio.token = **********************
-#smssender.twilio.phonenumber = +18888888888
-
 #
 # Security Microservice Specific Section
 #
-mailer.enabled = false
 mailer.hostname = smtp.gmail.com
 mailer.username = ************************
 mailer.password = ************************
@@ -83,16 +70,10 @@ openwifi.kafka.enable = true
 openwifi.kafka.brokerlist = a1.arilia.com:9092
 openwifi.kafka.auto.commit = false
 openwifi.kafka.queue.buffering.max.ms = 50
-openwifi.kafka.ssl.ca.location =
-openwifi.kafka.ssl.certificate.location =
-openwifi.kafka.ssl.key.location =
-openwifi.kafka.ssl.key.password =
-
 openwifi.document.policy.access = /wwwassets/access_policy.html
 openwifi.document.policy.password = /wwwassets/password_policy.html
 openwifi.avatar.maxsize = 2000000
 
-totp.issuer = OpenWiFi
 #
 # This section select which form of persistence you need
 # Only one selected at a time. If you select multiple, this service will die if a horrible
@@ -125,12 +106,44 @@ storage.type.mysql.database = ucentral
 storage.type.mysql.port = 3306
 storage.type.mysql.connectiontimeout = 60
 
+
 ########################################################################
 ########################################################################
 #
 # Logging: please leave as is for now.
 #
 ########################################################################
-logging.type = file
-logging.path = $OWSEC_ROOT/logs
-logging.level = debug
+logging.formatters.f1.class = PatternFormatter
+logging.formatters.f1.pattern = %s: [%p] %t
+logging.formatters.f1.times = UTC
+logging.channels.c1.class = ConsoleChannel
+logging.channels.c1.formatter = f1
+
+# This is where the logs will be written. This path MUST exist
+logging.channels.c2.class = FileChannel
+logging.channels.c2.path = $OWSEC_ROOT/logs/log
+logging.channels.c2.formatter.class = PatternFormatter
+logging.channels.c2.formatter.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t
+logging.channels.c2.rotation = 20 M
+logging.channels.c2.archive = timestamp
+logging.channels.c2.purgeCount = 20
+logging.channels.c3.class = ConsoleChannel
+logging.channels.c3.pattern = %s: [%p] %t
+
+# External Channel
+logging.loggers.root.channel = c2
+logging.loggers.root.level = debug
+
+# Inline Channel with PatternFormatter
+# logging.loggers.l1.name = logger1
+# logging.loggers.l1.channel.class = ConsoleChannel
+# logging.loggers.l1.channel.pattern = %s: [%p] %t
+# logging.loggers.l1.level = information
+# SplitterChannel
+# logging.channels.splitter.class = SplitterChannel
+# logging.channels.splitter.channels = l1,l2
+# logging.loggers.l2.name = logger2
+# logging.loggers.l2.channel = splitter
+
+
+

owsec.properties.tmpl

@@ -36,33 +36,20 @@ openwifi.system.data = ${SYSTEM_DATA}
 openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
 openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
 openwifi.system.uri.ui = ${SYSTEM_URI_UI}
-openwifi.security.restapi.disable = ${SECURITY_RESTAPI_DISABLE}
 openwifi.system.commandchannel = /tmp/app.ucentralsec
 openwifi.service.key = ${SERVICE_KEY}
 openwifi.service.key.password = ${SERVICE_KEY_PASSWORD}
 
-smssender.enabled = ${SMSSENDER_ENABLED}
-smssender.provider = ${SMSSENDER_PROVIDER}
-
-smssender.aws.secretkey = ${SMSSENDER_AWS_SECRETKEY}
-smssender.aws.accesskey = ${SMSSENDER_AWS_ACCESSKEY}
-smssender.aws.region = ${SMSSENDER_AWS_REGION}
-
-smssender.twilio.sid = ${SMSSENDER_TWILIO_SID}
-smssender.twilio.token = ${SMSSENDER_TWILIO_TOKEN}
-smssender.twilio.phonenumber = ${SMSSENDER_TWILIO_PHONENUMBER}
-
 #
 # Security Microservice Specific Section
 #
-mailer.enabled = ${MAILER_ENABLED}
 mailer.hostname = ${MAILER_HOSTNAME}
 mailer.username = ${MAILER_USERNAME}
 mailer.password = ${MAILER_PASSWORD}
 mailer.sender = ${MAILER_SENDER}
 mailer.loginmethod = login
 mailer.port = ${MAILER_PORT}
-mailer.templates = ${MAILER_TEMPLATES}
+mailer.templates = $UCENTRALSEC_ROOT/templates
 
 
 #############################
@@ -83,13 +70,9 @@ openwifi.kafka.enable = ${KAFKA_ENABLE}
 openwifi.kafka.brokerlist = ${KAFKA_BROKERLIST}
 openwifi.kafka.auto.commit = false
 openwifi.kafka.queue.buffering.max.ms = 50
-openwifi.kafka.ssl.ca.location = ${KAFKA_SSL_CA_LOCATION}
-openwifi.kafka.ssl.certificate.location = ${KAFKA_SSL_CERTIFICATE_LOCATION}
-openwifi.kafka.ssl.key.location = ${KAFKA_SSL_KEY_LOCATION}
-openwifi.kafka.ssl.key.password = ${KAFKA_SSL_KEY_PASSWORD}
 
-openwifi.document.policy.access = ${DOCUMENT_POLICY_ACCESS}
-openwifi.document.policy.password = ${DOCUMENT_POLICY_PASSWORD}
+openwifi.document.policy.access = /wwwassets/access_policy.html
+openwifi.document.policy.password = /wwwassets/password_policy.html
 openwifi.avatar.maxsize = 2000000
 #
 # This section select which form of persistence you need
@@ -127,6 +110,37 @@ storage.type.mysql.connectiontimeout = 60
 # Logging: please leave as is for now.
 #
 ########################################################################
-logging.type = console
-logging.path = $OWSEC_ROOT/logs
-logging.level = debug
+logging.formatters.f1.class = PatternFormatter
+logging.formatters.f1.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t
+logging.formatters.f1.times = UTC
+logging.channels.c1.class = ConsoleChannel
+logging.channels.c1.formatter = f1
+
+# This is where the logs will be written. This path MUST exist
+logging.channels.c2.class = FileChannel
+logging.channels.c2.path = $UCENTRALSEC_ROOT/logs/log
+logging.channels.c2.formatter.class = PatternFormatter
+logging.channels.c2.formatter.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t
+logging.channels.c2.rotation = 20 M
+logging.channels.c2.archive = timestamp
+logging.channels.c2.purgeCount = 20
+logging.channels.c3.class = ConsoleChannel
+logging.channels.c3.pattern = %s: [%p] %t
+
+# External Channel
+logging.loggers.root.channel = c1
+logging.loggers.root.level = debug
+
+# Inline Channel with PatternFormatter
+# logging.loggers.l1.name = logger1
+# logging.loggers.l1.channel.class = ConsoleChannel
+# logging.loggers.l1.channel.pattern = %s: [%p] %t
+# logging.loggers.l1.level = information
+# SplitterChannel
+# logging.channels.splitter.class = SplitterChannel
+# logging.channels.splitter.channels = l1,l2
+# logging.loggers.l2.name = logger2
+# logging.loggers.l2.channel = splitter
+
+
+

readiness_check

@@ -1,59 +0,0 @@
-#!/bin/bash
-set -e
-
-if [[ "$(which jq)" == "" ]]
-then
-  echo "You need the package jq installed to use this script."
-  exit 1
-fi
-
-if [[ "$(which curl)" == "" ]]
-then
-  echo "You need the package curl installed to use this script."
-  exit 1
-fi
-
-
-if [[ "${READINESS_METHOD}" == "systeminfo" ]]
-then
-  if [[ "${OWSEC_USERNAME}" == "" ]]
-  then
-    echo "You must set the variable OWSEC_USERNAME in order to use this script. Something like"
-    echo "OWSEC_USERNAME=tip@ucentral.com"
-    exit 1
-  fi
-
-  if [[ "${OWSEC_PASSWORD}" == "" ]]
-  then
-    echo "You must set the variable OWSEC_PASSWORD in order to use this script. Something like"
-    echo "OWSEC_PASSWORD=openwifi"
-    exit 1
-  fi
-
-  export RESTAPI_PORT=$(grep 'openwifi.restapi.host.0.port' $OWSEC_CONFIG/owsec.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-  # Get OAuth token from OWSEC and cache it or use cached one
-  payload="{ \"userId\" : \"$OWSEC_USERNAME\" , \"password\" : \"$OWSEC_PASSWORD\" }"
-  if [[ -f "/tmp/token" ]]
-  then
-    token=$(cat /tmp/token)
-  else
-    token=$(curl ${FLAGS} -k -X POST -H "Content-Type: application/json" -d "$payload" "https://localhost:$RESTAPI_PORT/api/v1/oauth2" | jq -r '.access_token')
-  fi
-  if [[ "${token}" == "" ]]
-  then
-    echo "Could not login. Please verify the host and username/password."
-    exit 13
-  fi
-  echo -n $token > /tmp/token
-
-  # Make systeminfo request to the local owsec instance
-  curl ${FLAGS} -k -X GET "https://localhost:$RESTAPI_PORT/api/v1/system?command=info" \
-    -H "accept: application/json" \
-    -H "Authorization: Bearer ${token}" > /tmp/result.json
-  exit_code=$?
-  jq < /tmp/result.json
-  exit $exit_code
-else
-  export ALB_PORT=$(grep 'alb.port' $OWSEC_CONFIG/owsec.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-  curl localhost:$ALB_PORT
-fi

src/ACLProcessor.h

@@ -1,90 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-12.
-//
-
-#ifndef OWSEC_ACLPROCESSOR_H
-#define OWSEC_ACLPROCESSOR_H
-
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-
-namespace OpenWifi {
-
-    class ACLProcessor {
-    public:
-        enum ACL_OPS {
-            READ,
-            MODIFY,
-            DELETE,
-            CREATE
-        };
-/*
- *  0) You can only delete yourself if you are a subscriber
-    1) You cannot delete yourself
-    2) If you are root, you can do anything.
-    3) You can do anything to yourself
-    4) Nobody can touch a root, unless they are a root, unless it is to get information on a ROOT
-    5) Creation rules:
-        ROOT -> create anything
-        PARTNER -> (multi-tenant owner) admin,subs,csr,installer,noc,accounting - matches to an entity in provisioning
-        ADMIN -> admin-subs-csr-installer-noc-accounting
-        ACCOUNTING -> subs-installer-csr
-
- */
-        static inline bool Can( const SecurityObjects::UserInfo & User, const SecurityObjects::UserInfo & Target, ACL_OPS Op) {
-
-            // rule 0
-            if(User.id == Target.id && User.userRole == SecurityObjects::SUBSCRIBER && Op == DELETE)
-                return true;
-
-            //  rule 1
-            if(User.id == Target.id && Op==DELETE)
-                return false;
-
-            //  rule 2
-            if(User.userRole==SecurityObjects::ROOT)
-                return true;
-
-            //  rule 3
-            if(User.id == Target.id)
-                return true;
-
-            //  rule 4
-            if(Target.userRole==SecurityObjects::ROOT && Op!=READ)
-                return false;
-
-            if(Op==CREATE) {
-                if(User.userRole==SecurityObjects::ROOT)
-                    return true;
-                if(User.userRole==SecurityObjects::PARTNER && (Target.userRole==SecurityObjects::ADMIN ||
-                    Target.userRole==SecurityObjects::SUBSCRIBER ||
-                    Target.userRole==SecurityObjects::CSR ||
-                    Target.userRole==SecurityObjects::INSTALLER ||
-                    Target.userRole==SecurityObjects::NOC ||
-                    Target.userRole==SecurityObjects::ACCOUNTING))
-                    return true;
-                if(User.userRole==SecurityObjects::ADMIN &&
-                    (Target.userRole==SecurityObjects::ADMIN ||
-                    Target.userRole==SecurityObjects::SUBSCRIBER ||
-                    Target.userRole==SecurityObjects::CSR ||
-                    Target.userRole==SecurityObjects::INSTALLER ||
-                    Target.userRole==SecurityObjects::NOC ||
-                    Target.userRole==SecurityObjects::ACCOUNTING))
-                    return true;
-                if(User.userRole==SecurityObjects::ACCOUNTING &&
-                    (Target.userRole==SecurityObjects::SUBSCRIBER ||
-                    Target.userRole==SecurityObjects::INSTALLER ||
-                    Target.userRole==SecurityObjects::CSR))
-                    return true;
-                return false;
-            }
-
-            return true;
-        }
-    private:
-
-    };
-
-}
-
-
-#endif //OWSEC_ACLPROCESSOR_H

src/ALBHealthCheckServer.h

@@ -0,0 +1,118 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_ALBHEALTHCHECKSERVER_H
+#define UCENTRALGW_ALBHEALTHCHECKSERVER_H
+
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include "Poco/Thread.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Logger.h"
+
+#include "Daemon.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+	class ALBRequestHandler: public Poco::Net::HTTPRequestHandler
+			/// Return a HTML document with the current date and time.
+		{
+		  public:
+			explicit ALBRequestHandler(Poco::Logger & L)
+				: Logger_(L)
+			{
+			}
+
+			void handleRequest(Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response) override
+			{
+				Logger_.information(Poco::format("ALB-REQUEST(%s): New ALB request.",Request.clientAddress().toString()));
+				Response.setChunkedTransferEncoding(true);
+				Response.setContentType("text/html");
+				Response.setDate(Poco::Timestamp());
+				Response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
+				Response.setKeepAlive(true);
+				Response.set("Connection","keep-alive");
+				Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
+				std::ostream &Answer = Response.send();
+				Answer << "uCentralGW Alive and kicking!" ;
+			}
+
+	  private:
+		Poco::Logger 	& Logger_;
+	};
+
+	class ALBRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory
+		{
+		  public:
+			explicit ALBRequestHandlerFactory(Poco::Logger & L):
+				Logger_(L)
+			{
+			}
+
+			ALBRequestHandler* createRequestHandler(const Poco::Net::HTTPServerRequest& request) override
+			{
+				if (request.getURI() == "/")
+					return new ALBRequestHandler(Logger_);
+				else
+					return nullptr;
+			}
+
+		  private:
+			Poco::Logger	&Logger_;
+		};
+
+    class ALBHealthCheckServer : public SubSystemServer {
+        public:
+            ALBHealthCheckServer() noexcept:
+                    SubSystemServer("ALBHealthCheckServer", "ALB-SVR", "alb")
+            {
+            }
+
+            static ALBHealthCheckServer *instance() {
+                if (instance_ == nullptr) {
+                    instance_ = new ALBHealthCheckServer;
+                }
+                return instance_;
+            }
+
+            int Start() override {
+                if(Daemon()->ConfigGetBool("alb.enable",false)) {
+                    Port_ = (int)Daemon()->ConfigGetInt("alb.port",15015);
+                    Socket_ = std::make_unique<Poco::Net::ServerSocket>(Port_);
+                    auto Params = new Poco::Net::HTTPServerParams;
+                    Server_ = std::make_unique<Poco::Net::HTTPServer>(new ALBRequestHandlerFactory(Logger_), *Socket_, Params);
+                    Server_->start();
+                }
+
+                return 0;
+            }
+
+            void Stop() override {
+                if(Server_)
+                    Server_->stop();
+            }
+
+          private:
+            static ALBHealthCheckServer *instance_;
+            std::unique_ptr<Poco::Net::HTTPServer>   	Server_;
+            std::unique_ptr<Poco::Net::ServerSocket> 	Socket_;
+            int                                     	Port_ = 0;
+        };
+
+    inline ALBHealthCheckServer * ALBHealthCheckServer() { return ALBHealthCheckServer::instance(); }
+    inline class ALBHealthCheckServer * ALBHealthCheckServer::instance_ = nullptr;
+}
+
+#endif // UCENTRALGW_ALBHEALTHCHECKSERVER_H

src/ActionLinkManager.cpp

@@ -1,128 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-08.
-//
-
-#include "ActionLinkManager.h"
-#include "StorageService.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "MessagingTemplates.h"
-#include "framework/utils.h"
-#include "fmt/format.h"
-
-namespace OpenWifi {
-
-    int ActionLinkManager::Start() {
-        poco_information(Logger(),"Starting...");
-        if(!Running_)
-            Thr_.start(*this);
-        return 0;
-    }
-
-    void ActionLinkManager::Stop() {
-        poco_information(Logger(),"Stopping...");
-        if(Running_) {
-            Running_ = false;
-            Thr_.wakeUp();
-            Thr_.join();
-        }
-        poco_information(Logger(),"Stopped...");
-    }
-
-    void ActionLinkManager::run() {
-        Running_ = true ;
-        Utils::SetThreadName("action-mgr");
-
-        while(Running_) {
-            Poco::Thread::trySleep(2000);
-            if(!Running_)
-                break;
-            std::vector<SecurityObjects::ActionLink>    Links;
-            {
-                std::lock_guard G(Mutex_);
-                StorageService()->ActionLinksDB().GetActions(Links);
-            }
-
-            if(Links.empty())
-                continue;
-
-            for(auto &i:Links) {
-                if(!Running_)
-                    break;
-
-                SecurityObjects::UserInfo UInfo;
-                if((i.action==OpenWifi::SecurityObjects::LinkActions::FORGOT_PASSWORD ||
-                    i.action==OpenWifi::SecurityObjects::LinkActions::VERIFY_EMAIL) && !StorageService()->UserDB().GetUserById(i.userId,UInfo)) {
-                    StorageService()->ActionLinksDB().CancelAction(i.id);
-                    continue;
-                } else if(( i.action==OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD ||
-                            i.action==OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL ||
-                            i.action==OpenWifi::SecurityObjects::LinkActions::SUB_SIGNUP ) && !StorageService()->SubDB().GetUserById(i.userId,UInfo)) {
-                    StorageService()->ActionLinksDB().CancelAction(i.id);
-                    continue;
-                } else if((i.action==OpenWifi::SecurityObjects::LinkActions::EMAIL_INVITATION) &&
-                        (OpenWifi::Now()-i.created)>(24*60*60)) {
-                    StorageService()->ActionLinksDB().CancelAction(i.id);
-                    continue;
-                }
-
-                switch(i.action) {
-                    case OpenWifi::SecurityObjects::LinkActions::FORGOT_PASSWORD: {
-                            if(AuthService::SendEmailToUser(i.id, UInfo.email, MessagingTemplates::FORGOT_PASSWORD)) {
-                                poco_information(Logger(),fmt::format("Send password reset link to {}",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::VERIFY_EMAIL: {
-                            if(AuthService::SendEmailToUser(i.id, UInfo.email, MessagingTemplates::EMAIL_VERIFICATION)) {
-                                poco_information(Logger(),fmt::format("Send email verification link to {}",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::EMAIL_INVITATION: {
-                            if(AuthService::SendEmailToUser(i.id, UInfo.email, MessagingTemplates::EMAIL_INVITATION)) {
-                                poco_information(Logger(),fmt::format("Send new subscriber email invitation link to {}",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD: {
-                            auto Signup = Poco::StringTokenizer(UInfo.signingUp,":");
-                            if(AuthService::SendEmailToSubUser(i.id, UInfo.email,MessagingTemplates::SUB_FORGOT_PASSWORD, Signup.count()==1 ? "" : Signup[0])) {
-                                poco_information(Logger(),fmt::format("Send subscriber password reset link to {}",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL: {
-                            auto Signup = Poco::StringTokenizer(UInfo.signingUp,":");
-                            if(AuthService::SendEmailToSubUser(i.id, UInfo.email, MessagingTemplates::SUB_EMAIL_VERIFICATION, Signup.count()==1 ? "" : Signup[0])) {
-                                poco_information(Logger(),fmt::format("Send subscriber email verification link to {}",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::SUB_SIGNUP: {
-                        auto Signup = Poco::StringTokenizer(UInfo.signingUp,":");
-                        if(AuthService::SendEmailToSubUser(i.id, UInfo.email, MessagingTemplates::SUB_SIGNUP_VERIFICATION, Signup.count()==1 ? "" : Signup[0])) {
-                            poco_information(Logger(),fmt::format("Send new subscriber email verification link to {}",UInfo.email));
-                        }
-                        StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    default: {
-                        StorageService()->ActionLinksDB().SentAction(i.id);
-                    }
-                }
-            }
-        }
-    }
-
-}

src/ActionLinkManager.h

@@ -1,34 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-08.
-//
-
-#pragma once
-
-#include "framework/SubSystemServer.h"
-
-namespace OpenWifi {
-
-    class ActionLinkManager : public SubSystemServer, Poco::Runnable {
-    public:
-
-        static ActionLinkManager * instance() {
-            static auto instance_ = new ActionLinkManager;
-            return instance_;
-        }
-
-        int Start() final;
-        void Stop() final;
-        void run() final;
-
-    private:
-        Poco::Thread        Thr_;
-        std::atomic_bool    Running_ = false;
-
-        ActionLinkManager() noexcept:
-            SubSystemServer("ActionLinkManager", "ACTION-SVR", "action.server")
-                {
-                }
-    };
-    inline ActionLinkManager * ActionLinkManager() { return ActionLinkManager::instance(); }
-}
-

src/AuthClient.cpp

@@ -0,0 +1,93 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include <utility>
+
+#include "AuthClient.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "Daemon.h"
+#include "OpenAPIRequest.h"
+
+namespace OpenWifi {
+	class AuthClient * AuthClient::instance_ = nullptr;
+
+	int AuthClient::Start() {
+		return 0;
+	}
+
+	void AuthClient::Stop() {
+
+	}
+
+	void AuthClient::RemovedCachedToken(const std::string &Token) {
+		std::lock_guard	G(Mutex_);
+		UserCache_.erase(Token);
+	}
+
+	bool IsTokenExpired(const SecurityObjects::WebToken &T) {
+		return ((T.expires_in_+T.created_)<std::time(nullptr));
+	}
+
+	bool AuthClient::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo ) {
+		std::lock_guard G(Mutex_);
+
+		auto User = UserCache_.find(SessionToken);
+		if(User != UserCache_.end() && !IsTokenExpired(User->second.webtoken)) {
+			UInfo = User->second;
+			return true;
+		} else {
+			Types::StringPairVec QueryData;
+			QueryData.push_back(std::make_pair("token",SessionToken));
+			OpenAPIRequestGet	Req(    uSERVICE_SECURITY,
+								  	"/api/v1/validateToken",
+									 QueryData,
+								  5000);
+			Poco::JSON::Object::Ptr Response;
+			if(Req.Do(Response)==Poco::Net::HTTPResponse::HTTP_OK) {
+				if(Response->has("tokenInfo") && Response->has("userInfo")) {
+					SecurityObjects::UserInfoAndPolicy	P;
+					P.from_json(Response);
+					UserCache_[SessionToken] = P;
+					UInfo = P;
+				}
+				return true;
+			}
+
+		}
+		return false;
+	}
+
+	bool AuthClient::IsTokenAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo) {
+		std::lock_guard G(Mutex_);
+
+		auto User = UserCache_.find(SessionToken);
+		if(User != UserCache_.end() && !IsTokenExpired(User->second.webtoken)) {
+			UInfo = User->second;
+			return true;
+		} else {
+			Types::StringPairVec QueryData;
+			QueryData.push_back(std::make_pair("token",SessionToken));
+			OpenAPIRequestGet	Req(uSERVICE_SECURITY,
+									 "/api/v1/validateToken",
+									 QueryData,
+									 5000);
+			Poco::JSON::Object::Ptr Response;
+			if(Req.Do(Response)==Poco::Net::HTTPResponse::HTTP_OK) {
+				if(Response->has("tokenInfo") && Response->has("userInfo")) {
+					SecurityObjects::UserInfoAndPolicy	P;
+					P.from_json(Response);
+					UserCache_[SessionToken] = P;
+					UInfo = P;
+				}
+				return true;
+			}
+
+		}
+		return false;
+	}
+}

src/AuthClient.h

@@ -0,0 +1,45 @@
+//
+// Created by stephane bourque on 2021-06-30.
+//
+
+#ifndef UCENTRALGW_AUTHCLIENT_H
+#define UCENTRALGW_AUTHCLIENT_H
+
+#include "Poco/JSON/Object.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/JWT/Signer.h"
+#include "Poco/SHA2Engine.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+class AuthClient : public SubSystemServer {
+	  public:
+		explicit AuthClient() noexcept:
+			SubSystemServer("Authentication", "AUTH-CLNT", "authentication")
+		{
+		}
+
+		static AuthClient *instance() {
+			if (instance_ == nullptr) {
+				instance_ = new AuthClient;
+			}
+			return instance_;
+		}
+
+		int Start() override;
+		void Stop() override;
+		bool IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string &SessionToken, OpenWifi::SecurityObjects::UserInfoAndPolicy & UInfo );
+		void RemovedCachedToken(const std::string &Token);
+		bool IsTokenAuthorized(const std::string &Token, SecurityObjects::UserInfoAndPolicy & UInfo);
+	  private:
+		static AuthClient 					*instance_;
+		OpenWifi::SecurityObjects::UserInfoCache 		UserCache_;
+	};
+
+	inline AuthClient * AuthClient() { return AuthClient::instance(); }
+}
+
+#endif // UCENTRALGW_AUTHCLIENT_H

src/AuthService.cpp

@@ -8,23 +8,22 @@
 
 #include <ctime>
 
-#include "framework/KafkaManager.h"
-#include "framework/KafkaTopics.h"
-
 #include "Poco/Net/OAuth20Credentials.h"
 #include "Poco/JWT/Token.h"
 #include "Poco/JWT/Signer.h"
-#include "Poco/StringTokenizer.h"
 
+#include "Daemon.h"
+#include "RESTAPI_handler.h"
 #include "StorageService.h"
 #include "AuthService.h"
-#include "framework/MicroServiceFuncs.h"
+#include "Utils.h"
+#include "KafkaManager.h"
+#include "Kafka_topics.h"
 
 #include "SMTPMailerService.h"
-#include "MFAServer.h"
-#include "MessagingTemplates.h"
 
 namespace OpenWifi {
+    class AuthService *AuthService::instance_ = nullptr;
 
     AuthService::ACCESS_TYPE AuthService::IntToAccessType(int C) {
 		switch (C) {
@@ -45,281 +44,102 @@ namespace OpenWifi {
 		return 1;	// some compilers complain...
 	}
 
-#if defined(TIP_CERT_SERVICE)
-    static const std::string DefaultPasswordRule{"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[\\{\\}\\(\\)~_\\+\\|\\\\\\[\\]\\;\\:\\<\\>\\.\\,\\/\\?\\\"\\'\\`\\=#?!@$%^&*-]).{12,}$"};
-#else
-    static const std::string DefaultPasswordRule{"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[\\{\\}\\(\\)~_\\+\\|\\\\\\[\\]\\;\\:\\<\\>\\.\\,\\/\\?\\\"\\'\\`\\=#?!@$%^&*-]).{8,}$"};
-#endif
-
     int AuthService::Start() {
-        poco_information(Logger(),"Starting...");
-        TokenAging_ = (uint64_t) MicroServiceConfigGetInt("authentication.token.ageing", 30 * 24 * 60 * 60);
-        RefreshTokenLifeSpan_ = (uint64_t) MicroServiceConfigGetInt("authentication.refresh_token.lifespan", 90 * 24 * 60 * 600);
-        HowManyOldPassword_ = MicroServiceConfigGetInt("authentication.oldpasswords", 5);
-
-        AccessPolicy_ = MicroServiceConfigGetString("openwifi.document.policy.access", "/wwwassets/access_policy.html");
-        PasswordPolicy_ = MicroServiceConfigGetString("openwifi.document.policy.password", "/wwwassets/password_policy.html");
-        PasswordValidation_ = PasswordValidationStr_ = MicroServiceConfigGetString("authentication.validation.expression",DefaultPasswordRule);
-
-        SubPasswordValidation_ = SubPasswordValidationStr_ = MicroServiceConfigGetString("subscriber.validation.expression",DefaultPasswordRule);
-        SubAccessPolicy_ = MicroServiceConfigGetString("subscriber.policy.access", "/wwwassets/access_policy.html");
-        SubPasswordPolicy_ = MicroServiceConfigGetString("subscriber.policy.password", "/wwwassets/password_policy.html");
-
+		Signer_.setRSAKey(Daemon()->Key());
+		Signer_.addAllAlgorithms();
+		Logger_.notice("Starting...");
+        Secure_ = Daemon()->ConfigGetBool("authentication.enabled",true);
+        DefaultPassword_ = Daemon()->ConfigGetString("authentication.default.password","");
+        DefaultUserName_ = Daemon()->ConfigGetString("authentication.default.username","");
+        Mechanism_ = Daemon()->ConfigGetString("authentication.service.type","internal");
+        PasswordValidation_ = PasswordValidationStr_ = Daemon()->ConfigGetString("authentication.validation.expression","^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$");
+        TokenAging_ = (uint64_t) Daemon()->ConfigGetInt("authentication.token.ageing", 30 * 24 * 60 * 60);
+        HowManyOldPassword_ = Daemon()->ConfigGetInt("authentication.oldpasswords", 5);
         return 0;
     }
 
     void AuthService::Stop() {
-        poco_information(Logger(),"Stopping...");
-        poco_information(Logger(),"Stopped...");
+		Logger_.notice("Stopping...");
     }
 
-    bool AuthService::RefreshUserToken(Poco::Net::HTTPServerRequest & Request, const std::string & RefreshToken, SecurityObjects::UserInfoAndPolicy & UI) {
-        try {
-            std::string CallToken;
-            Poco::Net::OAuth20Credentials Auth(Request);
-            if (Auth.getScheme() == "Bearer") {
-                CallToken = Auth.getBearerToken();
-            }
-
-            if (CallToken.empty()) {
-                return false;
-            }
-
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->UserTokenDB().GetToken(CallToken, UI.webtoken, UserId, RevocationDate) && UI.webtoken.refresh_token_==RefreshToken) {
-                auto now = Utils::Now();
-
-                //  Create a new token
-                auto NewToken = GenerateTokenHMAC( UI.webtoken.access_token_, CUSTOM);
-                auto NewRefreshToken = RefreshToken;
-                if(now - UI.webtoken.lastRefresh_ < RefreshTokenLifeSpan_) {
-                    NewRefreshToken = GenerateTokenHMAC( UI.webtoken.refresh_token_, CUSTOM);
-                    UI.webtoken.lastRefresh_ = now;
-                }
-
-                StorageService()->UserTokenDB().RefreshToken(CallToken, NewToken, NewRefreshToken, UI.webtoken.lastRefresh_ );
-                UI.webtoken.access_token_ = NewToken;
-                UI.webtoken.refresh_token_ = NewRefreshToken;
-                return true;
-            }
-            return false;
-
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    bool AuthService::RefreshSubToken(Poco::Net::HTTPServerRequest & Request, const std::string & RefreshToken, SecurityObjects::UserInfoAndPolicy & UI) {
-        try {
-            std::string CallToken;
-            Poco::Net::OAuth20Credentials Auth(Request);
-            if (Auth.getScheme() == "Bearer") {
-                CallToken = Auth.getBearerToken();
-            }
-
-            if (CallToken.empty()) {
-                return false;
-            }
-
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->SubTokenDB().GetToken(CallToken, UI.webtoken, UserId, RevocationDate) && UI.webtoken.refresh_token_==RefreshToken) {
-                auto now = Utils::Now();
-
-                //  Create a new token
-                auto NewToken = GenerateTokenHMAC( UI.webtoken.access_token_, CUSTOM);
-                auto NewRefreshToken = RefreshToken;
-                if(now - UI.webtoken.lastRefresh_ < RefreshTokenLifeSpan_) {
-                    NewRefreshToken = GenerateTokenHMAC( UI.webtoken.refresh_token_, CUSTOM);
-                    UI.webtoken.lastRefresh_ = now;
-                }
-
-                StorageService()->SubTokenDB().RefreshToken(CallToken, NewToken, NewRefreshToken, UI.webtoken.lastRefresh_ );
-                UI.webtoken.access_token_ = NewToken;
-                UI.webtoken.refresh_token_ = NewRefreshToken;
-                return true;
-            }
-            return false;
-
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    [[nodiscard]] bool AuthService::IsAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired) {
-        // std::lock_guard	Guard(Mutex_);
-        std::string CallToken{SessionToken};
-        Expired = false;
-        try {
-            SecurityObjects::WebToken   WT;
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->UserTokenDB().GetToken(CallToken, WT, UserId, RevocationDate)) {
-                if(RevocationDate!=0) {
-                    poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                    return false;
-                }
-                auto now=Utils::Now();
-                Expired = (WT.created_ + WT.expires_in_) < now;
-                if(StorageService()->UserDB().GetUserById(UserId,UInfo.userinfo)) {
-                    UInfo.webtoken = WT;
-                    poco_debug(Logger(), fmt::format("TokenValidation success for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                    return true;
-                }
-            }
-        } catch(const Poco::Exception &E) {
-            Logger().log(E);
-        }
-        poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-        return false;
-    }
-
-    bool AuthService::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired )
+	bool AuthService::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo )
     {
-        // std::lock_guard	Guard(Mutex_);
-        std::string CallToken;
-        Expired = false;
+        if(!Secure_)
+            return true;
+
+        std::lock_guard		Guard(Mutex_);
+
+		std::string CallToken;
 
 		try {
-            Poco::Net::OAuth20Credentials Auth(Request);
-            if (Auth.getScheme() == "Bearer") {
-                CallToken = Auth.getBearerToken();
-            }
+			Poco::Net::OAuth20Credentials Auth(Request);
 
-            if (CallToken.empty()) {
-                poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                return false;
+			if (Auth.getScheme() == "Bearer") {
+				CallToken = Auth.getBearerToken();
+			}
+		} catch(const Poco::Exception &E) {
+		}
+
+		if(!CallToken.empty()) {
+		    if(Storage()->IsTokenRevoked(CallToken))
+		        return false;
+		    auto Client = UserCache_.find(CallToken);
+		    if( Client == UserCache_.end() )
+		        return ValidateToken(CallToken, CallToken, UInfo);
+
+		    if((Client->second.webtoken.created_ + Client->second.webtoken.expires_in_) > time(nullptr)) {
+		        SessionToken = CallToken;
+		        UInfo = Client->second ;
+		        return true;
+		    }
+		    UserCache_.erase(CallToken);
+		    Storage()->RevokeToken(CallToken);
+		    return false;
+		}
+
+		return false;
+    }
+
+    bool AuthService::DeleteUserFromCache(const std::string &UserName) {
+        std::lock_guard		Guard(Mutex_);
+
+        for(auto i=UserCache_.begin();i!=UserCache_.end();) {
+            if (i->second.userinfo.email==UserName) {
+                Logout(i->first);
+                i = UserCache_.erase(i);
+            } else {
+                ++i;
             }
-            SessionToken = CallToken;
-            return IsAuthorized(SessionToken, UInfo, TID, Expired);
-        } catch(const Poco::Exception &E) {
-            Logger().log(E);
         }
-        poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-        return false;
-    }
-
-    bool AuthService::IsSubAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired )
-    {
-        // std::lock_guard	Guard(Mutex_);
-
-        std::string CallToken;
-        Expired = false;
-        try {
-            Poco::Net::OAuth20Credentials Auth(Request);
-            if (Auth.getScheme() == "Bearer") {
-                CallToken = Auth.getBearerToken();
-            }
-
-            if(CallToken.empty()) {
-                poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                return false;
-            }
-
-            SecurityObjects::WebToken   WT;
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->SubTokenDB().GetToken(CallToken, WT, UserId, RevocationDate)) {
-                if(RevocationDate!=0) {
-                    poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                    return false;
-                }
-                auto now=Utils::Now();
-                Expired = (WT.created_ + WT.expires_in_) < now;
-                if(StorageService()->SubDB().GetUserById(UserId,UInfo.userinfo)) {
-                    UInfo.webtoken = WT;
-                    SessionToken = CallToken;
-                    poco_debug(Logger(), fmt::format("TokenValidation success for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                    return true;
-                }
-            }
-        } catch(const Poco::Exception &E) {
-            Logger().log(E);
-        }
-        poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-        return false;
-    }
-
-    void AuthService::RevokeToken(std::string & Token) {
-        StorageService()->UserTokenDB().RevokeToken(Token);
-    }
-
-    void AuthService::RevokeSubToken(std::string & Token) {
-        StorageService()->SubTokenDB().RevokeToken(Token);
-    }
-
-    bool AuthService::DeleteUserFromCache(const std::string &Id) {
-        return StorageService()->UserTokenDB().DeleteRecordsFromCache("userName",Id);
-    }
-
-    bool AuthService::DeleteSubUserFromCache(const std::string &Id) {
-        return StorageService()->SubTokenDB().DeleteRecordsFromCache("userName",Id);
-    }
-
-    bool AuthService::RequiresMFA(const SecurityObjects::UserInfoAndPolicy &UInfo) {
-        return (UInfo.userinfo.userTypeProprietaryInfo.mfa.enabled && MFAServer::MethodEnabled(UInfo.userinfo.userTypeProprietaryInfo.mfa.method));
+        return true;
     }
 
     bool AuthService::ValidatePassword(const std::string &Password) {
         return std::regex_match(Password, PasswordValidation_);
     }
 
-    bool AuthService::ValidateSubPassword(const std::string &Password) {
-        return std::regex_match(Password, SubPasswordValidation_);
-    }
-
-    void AuthService::RemoveTokenSystemWide(const std::string &token) {
-        try {
-            if(KafkaManager()->Enabled()) {
-                Poco::JSON::Object Obj;
-                Obj.set("event", "remove-token");
-                Obj.set("id", MicroServiceID());
-                Obj.set("token", token);
-                std::stringstream ResultText;
-                Poco::JSON::Stringifier::stringify(Obj, ResultText);
-                KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(),
-                                            ResultText.str(),
-                                            false);
-            }
-        } catch (const Poco::Exception &E) {
-            Logger().log(E);
-        }
-    }
-
-    void AuthService::Logout(const std::string &Token,[[maybe_unused]]  bool EraseFromCache) {
+    void AuthService::Logout(const std::string &token) {
 		std::lock_guard		Guard(Mutex_);
 
+		UserCache_.erase(token);
+
         try {
-            auto tToken{Token};
-            StorageService()->UserTokenDB().DeleteRecord("token",tToken);
-            StorageService()->LoginDB().AddLogout(Token);
+            Poco::JSON::Object Obj;
+            Obj.set("event", "remove-token");
+            Obj.set("id", Daemon()->ID());
+            Obj.set("token", token);
+            std::stringstream ResultText;
+            Poco::JSON::Stringifier::stringify(Obj, ResultText);
+            std::string Tmp{token};
+            Storage()->RevokeToken(Tmp);
+            KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, Daemon()->PrivateEndPoint(), ResultText.str(),
+                                        false);
         } catch (const Poco::Exception &E) {
-            Logger().log(E);
+            Logger_.log(E);
         }
     }
 
-    void AuthService::SubLogout(const std::string &Token, [[maybe_unused]] bool EraseFromCache) {
-        std::lock_guard		Guard(Mutex_);
-
-        try {
-            auto tToken{Token};
-            StorageService()->SubTokenDB().DeleteRecord("token",tToken);
-            StorageService()->SubLoginDB().AddLogout(Token);
-        } catch (const Poco::Exception &E) {
-            Logger().log(E);
-        }
-    }
-
-    [[nodiscard]] std::string AuthService::GenerateTokenHMAC(const std::string & UserName, [[maybe_unused]] ACCESS_TYPE Type) {
-        std::string Identity(UserName + ":" + fmt::format("{}",Utils::Now()) + ":" + std::to_string(rand()));
-        HMAC_.update(Identity);
-        return Poco::DigestEngine::digestToHex(HMAC_.digest());
-    }
-
-    std::string AuthService::GenerateTokenJWT(const std::string & Identity, ACCESS_TYPE Type) {
+    std::string AuthService::GenerateToken(const std::string & Identity, ACCESS_TYPE Type) {
         std::lock_guard		Guard(Mutex_);
 
 		Poco::JWT::Token	T;
@@ -334,11 +154,34 @@ namespace OpenWifi {
 		T.payload().set("identity", Identity);
 		T.setIssuedAt(Poco::Timestamp());
 		T.setExpiration(Poco::Timestamp() + (long long)TokenAging_);
-		std::string JWT = MicroServiceSign(T,Poco::JWT::Signer::ALGO_RS256);
+		std::string JWT = Signer_.sign(T,Poco::JWT::Signer::ALGO_RS256);
 
 		return JWT;
     }
 
+	bool AuthService::ValidateToken(const std::string & Token, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo  ) {
+        std::lock_guard		Guard(Mutex_);
+		Poco::JWT::Token	DecryptedToken;
+
+		try {
+            auto E = UserCache_.find(SessionToken);
+            if(E == UserCache_.end()) {
+                if(Storage()->GetToken(SessionToken,UInfo)) {
+                    if(Storage()->GetUserById(UInfo.userinfo.email,UInfo.userinfo)) {
+                        UserCache_[UInfo.webtoken.access_token_] = UInfo;
+                        return true;
+                    }
+                }
+            } else {
+                UInfo = E->second;
+                return true;
+            }
+		} catch (const Poco::Exception &E ) {
+			Logger_.log(E);
+		}
+		return false;
+	}
+
     void AuthService::CreateToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo)
     {
         std::lock_guard		Guard(Mutex_);
@@ -349,170 +192,50 @@ namespace OpenWifi {
         UInfo.webtoken.expires_in_ = TokenAging_ ;
         UInfo.webtoken.idle_timeout_ = 5 * 60;
         UInfo.webtoken.token_type_ = "Bearer";
-        UInfo.webtoken.access_token_ = GenerateTokenHMAC(UInfo.userinfo.id,USERNAME);
-        UInfo.webtoken.id_token_ = GenerateTokenHMAC(UInfo.userinfo.id,USERNAME);
-        UInfo.webtoken.refresh_token_ = GenerateTokenHMAC(UInfo.userinfo.id,CUSTOM);
+        UInfo.webtoken.access_token_ = GenerateToken(UInfo.userinfo.Id,USERNAME);
+        UInfo.webtoken.id_token_ = GenerateToken(UInfo.userinfo.Id,USERNAME);
+        UInfo.webtoken.refresh_token_ = GenerateToken(UInfo.userinfo.Id,CUSTOM);
         UInfo.webtoken.created_ = time(nullptr);
         UInfo.webtoken.username_ = UserName;
         UInfo.webtoken.errorCode = 0;
         UInfo.webtoken.userMustChangePassword = false;
-        StorageService()->UserDB().SetLastLogin(UInfo.userinfo.id);
-        StorageService()->UserTokenDB().AddToken(UInfo.userinfo.id, UInfo.webtoken.access_token_,
+        UserCache_[UInfo.webtoken.access_token_] = UInfo;
+        Storage()->SetLastLogin(UInfo.userinfo.Id);
+        Storage()->AddToken(UInfo.webtoken.username_, UInfo.webtoken.access_token_,
                             UInfo.webtoken.refresh_token_, UInfo.webtoken.token_type_,
                                 UInfo.webtoken.expires_in_, UInfo.webtoken.idle_timeout_);
-        StorageService()->LoginDB().AddLogin(UInfo.userinfo.id, UInfo.userinfo.email,UInfo.webtoken.access_token_ );
-    }
-
-    void AuthService::CreateSubToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo)
-    {
-        std::lock_guard		Guard(Mutex_);
-
-        SecurityObjects::AclTemplate	ACL;
-        ACL.PortalLogin_ = ACL.Read_ = ACL.ReadWrite_ = ACL.ReadWriteCreate_ = ACL.Delete_ = true;
-        UInfo.webtoken.acl_template_ = ACL;
-        UInfo.webtoken.expires_in_ = TokenAging_ ;
-        UInfo.webtoken.idle_timeout_ = 5 * 60;
-        UInfo.webtoken.token_type_ = "Bearer";
-        UInfo.webtoken.access_token_ = GenerateTokenHMAC(UInfo.userinfo.id,USERNAME);
-        UInfo.webtoken.id_token_ = GenerateTokenHMAC(UInfo.userinfo.id,USERNAME);
-        UInfo.webtoken.refresh_token_ = GenerateTokenHMAC(UInfo.userinfo.id,CUSTOM);
-        UInfo.webtoken.created_ = time(nullptr);
-        UInfo.webtoken.username_ = UserName;
-        UInfo.webtoken.errorCode = 0;
-        UInfo.webtoken.userMustChangePassword = false;
-        StorageService()->SubDB().SetLastLogin(UInfo.userinfo.id);
-        StorageService()->SubTokenDB().AddToken(UInfo.userinfo.id, UInfo.webtoken.access_token_,
-                                   UInfo.webtoken.refresh_token_, UInfo.webtoken.token_type_,
-                                   UInfo.webtoken.expires_in_, UInfo.webtoken.idle_timeout_);
-        StorageService()->SubLoginDB().AddLogin(UInfo.userinfo.id, UInfo.userinfo.email,UInfo.webtoken.access_token_ );
     }
 
     bool AuthService::SetPassword(const std::string &NewPassword, SecurityObjects::UserInfo & UInfo) {
-        std::lock_guard     G(Mutex_);
-
-        Poco::toLowerInPlace(UInfo.email);
-        for (const auto &i:UInfo.lastPasswords) {
-            auto Tokens = Poco::StringTokenizer(i,"|");
-            if(Tokens.count()==2) {
-                const auto & Salt = Tokens[0];
-                for(const auto &j:UInfo.lastPasswords) {
-                    auto OldTokens = Poco::StringTokenizer(j,"|");
-                    if(OldTokens.count()==2) {
-                        SHA2_.update(Salt+NewPassword+UInfo.email);
-                        if(OldTokens[1]==Utils::ToHex(SHA2_.digest()))
-                            return false;
-                    }
-                }
-            } else {
-                SHA2_.update(NewPassword+UInfo.email);
-                if(Tokens[0]==Utils::ToHex(SHA2_.digest()))
-                    return false;
+        auto NewPasswordHash = ComputePasswordHash(UInfo.email, NewPassword);
+        for (auto const &i:UInfo.lastPasswords) {
+            if (i == NewPasswordHash) {
+                return false;
             }
         }
-
         if(UInfo.lastPasswords.size()==HowManyOldPassword_) {
             UInfo.lastPasswords.erase(UInfo.lastPasswords.begin());
         }
-
-        auto NewHash = ComputeNewPasswordHash(UInfo.email,NewPassword);
-        UInfo.lastPasswords.push_back(NewHash);
-        UInfo.currentPassword = NewHash;
+        UInfo.lastPasswords.push_back(NewPasswordHash);
+        UInfo.currentPassword = NewPasswordHash;
         UInfo.changePassword = false;
         return true;
     }
 
-    bool AuthService::SetSubPassword(const std::string &NewPassword, SecurityObjects::UserInfo & UInfo) {
-        std::lock_guard     G(Mutex_);
-
-        Poco::toLowerInPlace(UInfo.email);
-        for (const auto &i:UInfo.lastPasswords) {
-            auto Tokens = Poco::StringTokenizer(i,"|");
-            if(Tokens.count()==2) {
-                const auto & Salt = Tokens[0];
-                for(const auto &j:UInfo.lastPasswords) {
-                    auto OldTokens = Poco::StringTokenizer(j,"|");
-                    if(OldTokens.count()==2) {
-                        SHA2_.update(Salt+NewPassword+UInfo.email);
-                        if(OldTokens[1]==Utils::ToHex(SHA2_.digest()))
-                            return false;
-                    }
-                }
-            } else {
-                SHA2_.update(NewPassword+UInfo.email);
-                if(Tokens[0]==Utils::ToHex(SHA2_.digest()))
-                    return false;
-            }
-        }
-
-        if(UInfo.lastPasswords.size()==HowManyOldPassword_) {
-            UInfo.lastPasswords.erase(UInfo.lastPasswords.begin());
-        }
-
-        auto NewHash = ComputeNewPasswordHash(UInfo.email,NewPassword);
-        UInfo.lastPasswords.push_back(NewHash);
-        UInfo.currentPassword = NewHash;
-        UInfo.changePassword = false;
-        return true;
-    }
-
-    static std::string GetMeSomeSalt() {
-        auto start = std::chrono::high_resolution_clock::now();
-        return std::to_string(start.time_since_epoch().count());
-    }
-
-    std::string AuthService::ComputeNewPasswordHash(const std::string &UserName, const std::string &Password) {
-        std::string UName = Poco::trim(Poco::toLower(UserName));
-        auto Salt = GetMeSomeSalt();
-        SHA2_.update(Salt + Password + UName );
-        return Salt + "|" + Utils::ToHex(SHA2_.digest());
-    }
-
-    bool AuthService::ValidatePasswordHash(const std::string & UserName, const std::string & Password, const std::string &StoredPassword) {
-        std::lock_guard G(Mutex_);
-
-        std::string UName = Poco::trim(Poco::toLower(UserName));
-        auto Tokens = Poco::StringTokenizer(StoredPassword,"|");
-        if(Tokens.count()==1) {
-            SHA2_.update(Password+UName);
-            if(Tokens[0]==Utils::ToHex(SHA2_.digest()))
-                return true;
-        } else if (Tokens.count()==2) {
-            SHA2_.update(Tokens[0]+Password+UName);
-            if(Tokens[1]==Utils::ToHex(SHA2_.digest()))
-                return true;
-        }
-        return false;
-    }
-
-    bool AuthService::ValidateSubPasswordHash(const std::string & UserName, const std::string & Password, const std::string &StoredPassword) {
-        std::lock_guard G(Mutex_);
-
-        std::string UName = Poco::trim(Poco::toLower(UserName));
-        auto Tokens = Poco::StringTokenizer(StoredPassword,"|");
-        if(Tokens.count()==1) {
-            SHA2_.update(Password+UName);
-            if(Tokens[0]==Utils::ToHex(SHA2_.digest()))
-                return true;
-        } else if (Tokens.count()==2) {
-            SHA2_.update(Tokens[0]+Password+UName);
-            if(Tokens[1]==Utils::ToHex(SHA2_.digest()))
-                return true;
-        }
-        return false;
-    }
-
-    UNAUTHORIZED_REASON AuthService::Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo , [[maybe_unused]] bool & Expired )
+    AuthService::AUTH_ERROR AuthService::Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo )
     {
         std::lock_guard		Guard(Mutex_);
+        SecurityObjects::AclTemplate	ACL;
 
         Poco::toLowerInPlace(UserName);
+        auto PasswordHash = ComputePasswordHash(UserName, Password);
 
-        if(StorageService()->UserDB().GetUserByEmail(UserName,UInfo.userinfo)) {
+        if(Storage()->GetUserByEmail(UserName,UInfo.userinfo)) {
             if(UInfo.userinfo.waitingForEmailCheck) {
                 return USERNAME_PENDING_VERIFICATION;
             }
 
-            if(!ValidatePasswordHash(UserName,Password,UInfo.userinfo.currentPassword)) {
+            if(PasswordHash != UInfo.userinfo.currentPassword) {
                 return INVALID_CREDENTIALS;
             }
 
@@ -530,275 +253,97 @@ namespace OpenWifi {
                     UInfo.webtoken.errorCode = 1;
                     return PASSWORD_ALREADY_USED;
                 }
-                UInfo.userinfo.lastPasswordChange = Utils::Now();
+                UInfo.userinfo.lastPasswordChange = std::time(nullptr);
                 UInfo.userinfo.changePassword = false;
-                UInfo.userinfo.modified = Utils::Now();
-                StorageService()->UserDB().UpdateUserInfo(AUTHENTICATION_SYSTEM, UInfo.userinfo.id,UInfo.userinfo);
+                Storage()->UpdateUserInfo(AUTHENTICATION_SYSTEM, UInfo.userinfo.Id,UInfo.userinfo);
             }
 
             //  so we have a good password, password up date has taken place if need be, now generate the token.
-            UInfo.userinfo.lastLogin=Utils::Now();
-            StorageService()->UserDB().SetLastLogin(UInfo.userinfo.id);
+            UInfo.userinfo.lastLogin=std::time(nullptr);
+            Storage()->SetLastLogin(UInfo.userinfo.Id);
             CreateToken(UserName, UInfo );
+            return SUCCESS;
+        }
 
+        if(((UserName == DefaultUserName_) && (DefaultPassword_== ComputePasswordHash(UserName,Password))) || !Secure_)
+        {
+            ACL.PortalLogin_ = ACL.Read_ = ACL.ReadWrite_ = ACL.ReadWriteCreate_ = ACL.Delete_ = true;
+            UInfo.webtoken.acl_template_ = ACL;
+            UInfo.userinfo.email = DefaultUserName_;
+            UInfo.userinfo.currentPassword = DefaultPassword_;
+            UInfo.userinfo.name = DefaultUserName_;
+            CreateToken(UserName, UInfo );
             return SUCCESS;
         }
         return INVALID_CREDENTIALS;
     }
 
-    UNAUTHORIZED_REASON AuthService::AuthorizeSub( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo , [[maybe_unused]] bool & Expired )
-    {
-        std::lock_guard		Guard(Mutex_);
-
-        Poco::toLowerInPlace(UserName);
-
-        if(StorageService()->SubDB().GetUserByEmail(UserName,UInfo.userinfo)) {
-            if(UInfo.userinfo.waitingForEmailCheck) {
-                return USERNAME_PENDING_VERIFICATION;
-            }
-
-            if(!ValidateSubPasswordHash(UserName,Password,UInfo.userinfo.currentPassword)) {
-                return INVALID_CREDENTIALS;
-            }
-
-            if(UInfo.userinfo.changePassword && NewPassword.empty()) {
-                UInfo.webtoken.userMustChangePassword = true ;
-                return PASSWORD_CHANGE_REQUIRED;
-            }
-
-            if(!NewPassword.empty() && !ValidateSubPassword(NewPassword)) {
-                return PASSWORD_INVALID;
-            }
-
-            if(UInfo.userinfo.changePassword || !NewPassword.empty()) {
-                if(!SetSubPassword(NewPassword,UInfo.userinfo)) {
-                    UInfo.webtoken.errorCode = 1;
-                    return PASSWORD_ALREADY_USED;
-                }
-                UInfo.userinfo.lastPasswordChange = Utils::Now();
-                UInfo.userinfo.changePassword = false;
-                UInfo.userinfo.modified = Utils::Now();
-                StorageService()->SubDB().UpdateUserInfo(AUTHENTICATION_SYSTEM, UInfo.userinfo.id,UInfo.userinfo);
-            }
-
-            //  so we have a good password, password update has taken place if need be, now generate the token.
-            UInfo.userinfo.lastLogin=Utils::Now();
-            StorageService()->SubDB().SetLastLogin(UInfo.userinfo.id);
-            CreateSubToken(UserName, UInfo );
-
-            return SUCCESS;
-        }
-
-        return INVALID_CREDENTIALS;
+    std::string AuthService::ComputePasswordHash(const std::string &UserName, const std::string &Password) {
+        std::string UName = Poco::trim(Poco::toLower(UserName));
+        SHA2_.update(Password + UName);
+        return Utils::ToHex(SHA2_.digest());
     }
 
-    bool AuthService::SendEmailChallengeCode(const SecurityObjects::UserInfoAndPolicy &UInfo, const std::string &Challenge) {
-        auto OperatorParts = Poco::StringTokenizer(UInfo.userinfo.signingUp,":");
-        if(UInfo.userinfo.signingUp.empty() || OperatorParts.count()!=2) {
-            MessageAttributes Attrs;
-            Attrs[RECIPIENT_EMAIL] = UInfo.userinfo.email;
-            Attrs[LOGO] = AuthService::GetLogoAssetURI();
-            Attrs[SUBJECT] = "Login validation code";
-            Attrs[CHALLENGE_CODE] = Challenge;
-            return SMTPMailerService()->SendMessage(UInfo.userinfo.email, MessagingTemplates::TemplateName(MessagingTemplates::VERIFICATION_CODE), Attrs, false);
-        } else {
-            MessageAttributes Attrs;
-            Attrs[RECIPIENT_EMAIL] = UInfo.userinfo.email;
-            Attrs[LOGO] = AuthService::GetSubLogoAssetURI();
-            Attrs[SUBJECT] = "Login validation code";
-            Attrs[CHALLENGE_CODE] = Challenge;
-            return SMTPMailerService()->SendMessage(UInfo.userinfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_VERIFICATION_CODE,OperatorParts[0]), Attrs, true );
-        }
-    }
-
-    bool AuthService::SendEmailToUser(const std::string &LinkId, std::string &Email, MessagingTemplates::EMAIL_REASON Reason) {
+    bool AuthService::SendEmailToUser(std::string &Email, EMAIL_REASON Reason) {
         SecurityObjects::UserInfo   UInfo;
 
-        if(StorageService()->UserDB().GetUserByEmail(Email,UInfo)) {
+        if(Storage()->GetUserByEmail(Email,UInfo)) {
             switch (Reason) {
-
-                case MessagingTemplates::FORGOT_PASSWORD: {
+                case FORGOT_PASSWORD: {
                         MessageAttributes Attrs;
+
                         Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                        Attrs[LOGO] = GetLogoAssetURI();
+                        Attrs[LOGO] = "logo.jpg";
                         Attrs[SUBJECT] = "Password reset link";
-                        Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=password_reset&id=" + LinkId ;
-                        Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=password_reset&id=" + LinkId ;
-                        SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::FORGOT_PASSWORD), Attrs, false);
+                        Attrs[ACTION_LINK] =
+                                Daemon()->GetPublicAPIEndPoint() + "/actionLink?action=password_reset&id=" + UInfo.Id ;
+                        SMTPMailerService()->SendMessage(UInfo.email, "password_reset.txt", Attrs);
                     }
                     break;
 
-                case MessagingTemplates::EMAIL_VERIFICATION: {
+                case EMAIL_VERIFICATION: {
                         MessageAttributes Attrs;
+
                         Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                        Attrs[LOGO] = GetLogoAssetURI();
-                        Attrs[SUBJECT] = "e-mail Address Verification";
-                        Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=email_verification&id=" + LinkId ;
-                        Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=email_verification&id=" + LinkId ;
-                        SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::EMAIL_VERIFICATION), Attrs, false);
+                        Attrs[LOGO] = "logo.jpg";
+                        Attrs[SUBJECT] = "EMail Address Verification";
+                        Attrs[ACTION_LINK] =
+                                Daemon()->GetPublicAPIEndPoint() + "/actionLink?action=email_verification&id=" + UInfo.Id ;
+                        SMTPMailerService()->SendMessage(UInfo.email, "email_verification.txt", Attrs);
                         UInfo.waitingForEmailCheck = true;
                     }
                     break;
 
-                case MessagingTemplates::EMAIL_INVITATION: {
-                    MessageAttributes Attrs;
-                    Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetLogoAssetURI();
-                    Attrs[SUBJECT] = "e-mail Invitation";
-                    Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=email_invitation&id=" + LinkId ;
-                    Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=email_invitation&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::EMAIL_INVITATION), Attrs, false);
-                    UInfo.waitingForEmailCheck = true;
-                    }
-                    break;
-
                 default:
                     break;
             }
-            return true;
-        }
-        return false;
-    }
-
-    bool AuthService::SendEmailToSubUser(const std::string &LinkId, std::string &Email, MessagingTemplates::EMAIL_REASON Reason, const std::string &OperatorName ) {
-        SecurityObjects::UserInfo   UInfo;
-
-        if(StorageService()->SubDB().GetUserByEmail(Email,UInfo)) {
-            switch (Reason) {
-
-                case MessagingTemplates::SUB_FORGOT_PASSWORD: {
-                    MessageAttributes Attrs;
-                    Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetSubLogoAssetURI();
-                    Attrs[SUBJECT] = "Password reset link";
-                    Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=sub_password_reset&id=" + LinkId ;
-                    Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=sub_password_reset&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_FORGOT_PASSWORD, OperatorName), Attrs, true);
-                }
-                break;
-
-                case MessagingTemplates::SUB_EMAIL_VERIFICATION: {
-                    MessageAttributes Attrs;
-                    Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetSubLogoAssetURI();
-                    Attrs[SUBJECT] = "e-mail Address Verification";
-                    Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=sub_email_verification&id=" + LinkId ;
-                    Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=sub_email_verification&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_EMAIL_VERIFICATION, OperatorName), Attrs, true);
-                    UInfo.waitingForEmailCheck = true;
-                }
-                break;
-
-                case MessagingTemplates::SUB_SIGNUP_VERIFICATION: {
-                    MessageAttributes Attrs;
-                    Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetSubLogoAssetURI();
-                    Attrs[SUBJECT] = "Signup e-mail Address Verification";
-                    Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=signup_verification&id=" + LinkId ;
-                    Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=signup_verification&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_SIGNUP_VERIFICATION, OperatorName), Attrs, true);
-                    UInfo.waitingForEmailCheck = true;
-                }
-                break;
-
-                default:
-                    break;
-            }
-            return true;
         }
         return false;
     }
 
     bool AuthService::VerifyEmail(SecurityObjects::UserInfo &UInfo) {
-        SecurityObjects::ActionLink A;
+        MessageAttributes Attrs;
 
-        A.action = OpenWifi::SecurityObjects::LinkActions::VERIFY_EMAIL;
-        A.userId = UInfo.id;
-        A.id = MicroServiceCreateUUID();
-        A.created = Utils::Now();
-        A.expires = A.created + 24*60*60;
-        A.userAction = true;
-        StorageService()->ActionLinksDB().CreateAction(A);
+        Attrs[RECIPIENT_EMAIL] = UInfo.email;
+        Attrs[LOGO] = "logo.jpg";
+        Attrs[SUBJECT] = "EMail Address Verification";
+        Attrs[ACTION_LINK] =
+                Daemon()->GetPublicAPIEndPoint() + "/actionLink?action=email_verification&id=" + UInfo.Id ;
+        SMTPMailerService()->SendMessage(UInfo.email, "email_verification.txt", Attrs);
         UInfo.waitingForEmailCheck = true;
-        UInfo.validated = false;
         return true;
     }
 
-    bool AuthService::VerifySubEmail(SecurityObjects::UserInfo &UInfo) {
-        SecurityObjects::ActionLink A;
+    bool AuthService::IsValidToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo) {
+        std::lock_guard G(Mutex_);
+        auto It = UserCache_.find(Token);
 
-        A.action = OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL;
-        A.userId = UInfo.id;
-        A.id = MicroServiceCreateUUID();
-        A.created = Utils::Now();
-        A.expires = A.created + 24*60*60;
-        A.userAction = false;
-        StorageService()->ActionLinksDB().CreateAction(A);
-        UInfo.waitingForEmailCheck = true;
-        UInfo.validated = false;
+        if(It==UserCache_.end())
+            return false;
+        WebToken = It->second.webtoken;
+        UserInfo = It->second.userinfo;
         return true;
     }
 
-    bool AuthService::IsValidToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired) {
-
-        std::lock_guard G(Mutex_);
-        Expired = false;
-
-        std::string TToken{Token}, UserId;
-        SecurityObjects::WebToken   WT;
-        uint64_t RevocationDate=0;
-        if(StorageService()->UserTokenDB().GetToken(TToken, WT, UserId, RevocationDate)) {
-            if(RevocationDate!=0)
-                return false;
-            Expired = (WT.created_ + WT.expires_in_) < Utils::Now();
-            if(StorageService()->UserDB().GetUserById(UserId,UserInfo)) {
-                WebToken = WT;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    bool AuthService::IsValidSubToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired) {
-        std::lock_guard G(Mutex_);
-        Expired = false;
-
-        std::string TToken{Token}, UserId;
-        SecurityObjects::WebToken   WT;
-        uint64_t RevocationDate=0;
-        if(StorageService()->SubTokenDB().GetToken(TToken, WT, UserId, RevocationDate)) {
-            if(RevocationDate!=0)
-                return false;
-            Expired = (WT.created_ + WT.expires_in_) < Utils::Now();
-            if(StorageService()->SubDB().GetUserById(UserId,UserInfo)) {
-                WebToken = WT;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    bool AuthService::IsValidApiKey(const std::string &ApiKey, SecurityObjects::WebToken &WebToken,
-                                    SecurityObjects::UserInfo &UserInfo, bool &Expired, std::uint64_t &expiresOn) {
-
-        std::lock_guard G(Mutex_);
-
-        std::string UserId;
-        SecurityObjects::WebToken   WT;
-        SecurityObjects::ApiKeyEntry    ApiKeyEntry;
-        if(StorageService()->ApiKeyDB().GetRecord("apiKey", ApiKey, ApiKeyEntry)) {
-            expiresOn = ApiKeyEntry.expiresOn;
-            Expired = ApiKeyEntry.expiresOn < Utils::Now();
-            if(Expired)
-                return false;
-            if(StorageService()->UserDB().GetUserById(ApiKeyEntry.userUuid,UserInfo)) {
-                WebToken = WT;
-                ApiKeyEntry.lastUse = Utils::Now();
-                StorageService()->ApiKeyDB().UpdateRecord("id", ApiKeyEntry.id, ApiKeyEntry);
-                return true;
-            }
-        }
-        return false;
-    }
 
 }  // end of namespace

src/AuthService.h

@@ -6,25 +6,20 @@
 //	Arilia Wireless Inc.
 //
 
-#pragma once
+#ifndef UCENTRAL_UAUTHSERVICE_H
+#define UCENTRAL_UAUTHSERVICE_H
 
 #include <regex>
 
-#include "framework/SubSystemServer.h"
+#include "SubSystemServer.h"
+
 #include "Poco/JSON/Object.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "Poco/JWT/Signer.h"
 #include "Poco/SHA2Engine.h"
-#include "Poco/Crypto/DigestEngine.h"
-#include "Poco/HMACEngine.h"
-#include "Poco/ExpireLRUCache.h"
 
-#include "framework/MicroServiceFuncs.h"
-#include "framework/ow_constants.h"
-
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "MessagingTemplates.h"
+#include "RESTAPI_SecurityObjects.h"
 
 namespace OpenWifi{
 
@@ -39,142 +34,77 @@ namespace OpenWifi{
             CUSTOM
         };
 
+        enum AUTH_ERROR {
+            SUCCESS,
+            PASSWORD_CHANGE_REQUIRED,
+            INVALID_CREDENTIALS,
+            PASSWORD_ALREADY_USED,
+            USERNAME_PENDING_VERIFICATION,
+            PASSWORD_INVALID,
+            INTERNAL_ERROR
+        };
+
+        enum EMAIL_REASON {
+            FORGOT_PASSWORD,
+            EMAIL_VERIFICATION
+        };
+
         static ACCESS_TYPE IntToAccessType(int C);
         static int AccessTypeToInt(ACCESS_TYPE T);
 
-        static auto instance() {
-            static auto instance_ = new AuthService;
+        static AuthService *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new AuthService;
+            }
             return instance_;
         }
 
         int Start() override;
         void Stop() override;
 
-        [[nodiscard]] bool IsAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired);
-        [[nodiscard]] bool IsAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired);
-
-        [[nodiscard]] UNAUTHORIZED_REASON Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired );
+        [[nodiscard]] bool IsAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo );
+        [[nodiscard]] AUTH_ERROR Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo );
         void CreateToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo);
+        [[nodiscard]] bool ValidateToken(const std::string & Token, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UserInfo  );
         [[nodiscard]] bool SetPassword(const std::string &Password, SecurityObjects::UserInfo & UInfo);
         [[nodiscard]] const std:: string & PasswordValidationExpression() const { return PasswordValidationStr_;};
-        void Logout(const std::string &token, bool EraseFromCache=true);
-
-        [[nodiscard]] bool IsSubAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired);
-        [[nodiscard]] UNAUTHORIZED_REASON AuthorizeSub( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired );
-
-        void CreateSubToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo);
-        [[nodiscard]] bool SetSubPassword(const std::string &Password, SecurityObjects::UserInfo & UInfo);
-        [[nodiscard]] const std:: string & SubPasswordValidationExpression() const { return PasswordValidationStr_;};
-        void SubLogout(const std::string &token, bool EraseFromCache=true);
-
-        void RemoveTokenSystemWide(const std::string &token);
+        void Logout(const std::string &token);
 
         bool ValidatePassword(const std::string &pwd);
-        bool ValidateSubPassword(const std::string &pwd);
-
-        [[nodiscard]] bool IsValidToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired);
-        [[nodiscard]] bool IsValidSubToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired);
-        [[nodiscard]] std::string GenerateTokenJWT(const std::string & UserName, ACCESS_TYPE Type);
-        [[nodiscard]] std::string GenerateTokenHMAC(const std::string & UserName, ACCESS_TYPE Type);
-
-        [[nodiscard]] bool IsValidApiKey(const std::string &ApiKey, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired, std::uint64_t & expiresOn);
-        [[nodiscard]] std::string ComputeNewPasswordHash(const std::string &UserName, const std::string &Password);
-        [[nodiscard]] bool ValidatePasswordHash(const std::string & UserName, const std::string & Password, const std::string &StoredPassword);
-        [[nodiscard]] bool ValidateSubPasswordHash(const std::string & UserName, const std::string & Password, const std::string &StoredPassword);
 
+        [[nodiscard]] bool IsValidToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo);
+        [[nodiscard]] bool IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request);
+        [[nodiscard]] std::string GenerateToken(const std::string & UserName, ACCESS_TYPE Type);
+        [[nodiscard]] bool ValidateToken(const std::string & Token, std::string & SessionToken, SecurityObjects::WebToken & UserInfo  );
+        [[nodiscard]] std::string ComputePasswordHash(const std::string &UserName, const std::string &Password);
         [[nodiscard]] bool UpdatePassword(const std::string &Admin, const std::string &UserName, const std::string & OldPassword, const std::string &NewPassword);
         [[nodiscard]] std::string ResetPassword(const std::string &Admin, const std::string &UserName);
 
-        [[nodiscard]] bool UpdateSubPassword(const std::string &Admin, const std::string &UserName, const std::string & OldPassword, const std::string &NewPassword);
-        [[nodiscard]] std::string ResetSubPassword(const std::string &Admin, const std::string &UserName);
-
         [[nodiscard]] static bool VerifyEmail(SecurityObjects::UserInfo &UInfo);
-        [[nodiscard]] static bool VerifySubEmail(SecurityObjects::UserInfo &UInfo);
-
-        [[nodiscard]] static bool SendEmailToUser(const std::string &LinkId, std::string &Email, MessagingTemplates::EMAIL_REASON Reason);
-        [[nodiscard]] static bool SendEmailToSubUser(const std::string &LinkId, std::string &Email, MessagingTemplates::EMAIL_REASON Reason, const std::string &OperatorName);
-        [[nodiscard]] bool RequiresMFA(const SecurityObjects::UserInfoAndPolicy &UInfo);
-
-        [[nodiscard]] bool SendEmailChallengeCode(const SecurityObjects::UserInfoAndPolicy &UInfo, const std::string &code);
-
-        bool DeleteUserFromCache(const std::string &UserName);
-        bool DeleteSubUserFromCache(const std::string &UserName);
-        void RevokeToken(std::string & Token);
-        void RevokeSubToken(std::string & Token);
-
-        [[nodiscard]] static inline const std::string GetLogoAssetURI() {
-            return MicroServicePublicEndPoint() + "/wwwassets/logo.png";
-        }
-
-        [[nodiscard]] static inline const std::string GetLogoAssetFileName() {
-            return MicroServiceWWWAssetsDir() + "/logo.png";
-        }
-
-        [[nodiscard]] static inline const std::string GetSubLogoAssetURI() {
-            return MicroServicePublicEndPoint() + "/wwwassets/sub_logo.png";
-        }
-
-        [[nodiscard]] static inline const std::string GetSubLogoAssetFileName() {
-            return MicroServiceWWWAssetsDir() + "/sub_logo.png";
-        }
-
-        inline const std::string & GetPasswordPolicy() const { return PasswordPolicy_; }
-        inline const std::string & GetAccessPolicy() const { return AccessPolicy_; }
-
-        inline const std::string & GetSubPasswordPolicy() const { return SubPasswordPolicy_; }
-        inline const std::string & GetSubAccessPolicy() const { return SubAccessPolicy_; }
-
-        bool RefreshUserToken(Poco::Net::HTTPServerRequest & Request, const std::string & RefreshToken, SecurityObjects::UserInfoAndPolicy & UI);
-        bool RefreshSubToken(Poco::Net::HTTPServerRequest & Request, const std::string & RefreshToken, SecurityObjects::UserInfoAndPolicy & UI);
+        [[nodiscard]] static bool SendEmailToUser(std::string &Email, EMAIL_REASON Reason);
+        [[nodiscard]] bool DeleteUserFromCache(const std::string &UserName);
 
     private:
+		static AuthService *instance_;
+		bool    			Secure_ = false ;
+		std::string     	DefaultUserName_;
+		std::string			DefaultPassword_;
+		std::string     	Mechanism_;
+		Poco::JWT::Signer	Signer_;
 		Poco::SHA2Engine	SHA2_;
-
-		std::string         AccessPolicy_;
-		std::string         PasswordPolicy_;
-		std::string         SubAccessPolicy_;
-		std::string         SubPasswordPolicy_;
-		std::string         PasswordValidationStr_;
-        std::string         SubPasswordValidationStr_;
-        std::regex          PasswordValidation_;
-        std::regex          SubPasswordValidation_;
-
-        uint64_t            TokenAging_ = 15 * 24 * 60 * 60;
+		SecurityObjects::UserInfoCache UserCache_;
+        std::string          PasswordValidationStr_;
+		std::regex          PasswordValidation_;
+		uint64_t            TokenAging_ = 30 * 24 * 60 * 60;
         uint64_t            HowManyOldPassword_=5;
-        uint64_t            RefreshTokenLifeSpan_ = 90 * 24 * 60 * 60 ;
-
-        class SHA256Engine : public Poco::Crypto::DigestEngine
-                {
-                public:
-                    enum
-                    {
-                        BLOCK_SIZE = 64,
-                        DIGEST_SIZE = 32
-                    };
-
-                    SHA256Engine()
-                    : DigestEngine("SHA256")
-                    {
-                    }
-
-                };
-
-        Poco::HMACEngine<SHA256Engine> HMAC_{"tipopenwifi"};
-
         AuthService() noexcept:
             SubSystemServer("Authentication", "AUTH-SVR", "authentication")
         {
         }
     };
 
-    inline auto AuthService() { return AuthService::instance(); }
-
-    [[nodiscard]] inline bool AuthServiceIsAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo , std::uint64_t TID, bool & Expired, bool Sub ) {
-        if(Sub)
-            return AuthService()->IsSubAuthorized(Request, SessionToken, UInfo, TID, Expired );
-        else
-            return AuthService()->IsAuthorized(Request, SessionToken, UInfo, TID, Expired );
-    }
+    inline AuthService * AuthService() { return AuthService::instance(); }
 
 } // end of namespace
 
+#endif //UCENTRAL_UAUTHSERVICE_H

src/Daemon.cpp

@@ -10,6 +10,8 @@
 //	Arilia Wireless Inc.
 //
 
+#include <cstdlib>
+#include <boost/algorithm/string.hpp>
 
 #include "Poco/Util/Application.h"
 #include "Poco/Util/Option.h"
@@ -17,17 +19,13 @@
 
 #include "Daemon.h"
 
-#include <aws/core/Aws.h>
-#include <aws/s3/model/AccessControlPolicy.h>
-
+#include "ALBHealthCheckServer.h"
+#include "KafkaManager.h"
 #include "StorageService.h"
+#include "RESTAPI_server.h"
 #include "SMTPMailerService.h"
+#include "RESTAPI_InternalServer.h"
 #include "AuthService.h"
-#include "SMSSender.h"
-#include "ActionLinkManager.h"
-#include "TotpCache.h"
-#include "framework/RESTAPI_RateLimiter.h"
-#include "framework/UI_WebSocketClientServer.h"
 
 namespace OpenWifi {
     class Daemon *Daemon::instance_ = nullptr;
@@ -39,48 +37,32 @@ namespace OpenWifi {
                                    vDAEMON_CONFIG_ENV_VAR,
                                    vDAEMON_APP_NAME,
                                    vDAEMON_BUS_TIMER,
-                                   SubSystemVec{
-                                           StorageService(),
-                                           SMSSender(),
-                                           ActionLinkManager(),
+                                   Types::SubSystemVec{
+                                           Storage(),
+                                           RESTAPI_Server(),
+                                           RESTAPI_InternalServer(),
                                            SMTPMailerService(),
-                                           RESTAPI_RateLimiter(),
-                                           TotpCache(),
-                                           AuthService(),
-                                           UI_WebSocketClientServer()
+                                           AuthService()
                                    });
         }
         return instance_;
     }
 
-    void Daemon::PostInitialization([[maybe_unused]] Poco::Util::Application &self) {
-        AssetDir_ = MicroService::instance().ConfigPath("openwifi.restapi.wwwassets");
-    }
-
-    void DaemonPostInitialization(Poco::Util::Application &self) {
-        Daemon()->PostInitialization(self);
+    void Daemon::initialize(Poco::Util::Application &self) {
+        MicroService::initialize(*this);
     }
 }
 
 int main(int argc, char **argv) {
     try {
-        SSL_library_init();
-        Aws::SDKOptions AwsOptions;
-        AwsOptions.memoryManagementOptions.memoryManager = nullptr;
-        AwsOptions.cryptoOptions.initAndCleanupOpenSSL = false;
-        AwsOptions.httpOptions.initAndCleanupCurl = true;
+        auto App = OpenWifi::Daemon::instance();
+        auto ExitCode =  App->run(argc, argv);
+        delete App;
 
-        Aws::InitAPI(AwsOptions);
-
-        int ExitCode=0;
-        {
-            auto App = OpenWifi::Daemon::instance();
-            ExitCode =  App->run(argc, argv);
-        }
-        ShutdownAPI(AwsOptions);
         return ExitCode;
+
     } catch (Poco::Exception &exc) {
-        std::cout << exc.displayText() << std::endl;
+        std::cerr << exc.displayText() << std::endl;
         return Poco::Util::Application::EXIT_SOFTWARE;
     }
 }

src/Daemon.h

@@ -2,16 +2,14 @@
 // Created by stephane bourque on 2021-06-10.
 //
 
-#pragma once
+#ifndef UCENTRALSEC_DAEMON_H
+#define UCENTRALSEC_DAEMON_H
 
 #include <iostream>
 #include <cstdlib>
 #include <vector>
 #include <set>
 
-#include "framework/MicroServiceNames.h"
-#include "framework/MicroService.h"
-
 #include "Poco/Util/Application.h"
 #include "Poco/Util/ServerApplication.h"
 #include "Poco/Util/Option.h"
@@ -23,13 +21,16 @@
 #include "Poco/Crypto/Cipher.h"
 
 
+#include "OpenWifiTypes.h"
+#include "MicroService.h"
+
 namespace OpenWifi {
 
-    [[maybe_unused]] static const char * vDAEMON_PROPERTIES_FILENAME = "owsec.properties";
-    [[maybe_unused]] static const char * vDAEMON_ROOT_ENV_VAR = "OWSEC_ROOT";
-    [[maybe_unused]] static const char * vDAEMON_CONFIG_ENV_VAR = "OWSEC_CONFIG";
-    [[maybe_unused]] static const char * vDAEMON_APP_NAME = uSERVICE_SECURITY.c_str();
-    [[maybe_unused]] static const uint64_t vDAEMON_BUS_TIMER = 5000;
+    static const char * vDAEMON_PROPERTIES_FILENAME = "owsec.properties";
+    static const char * vDAEMON_ROOT_ENV_VAR = "OWSEC_ROOT";
+    static const char * vDAEMON_CONFIG_ENV_VAR = "OWSEC_CONFIG";
+    static const char * vDAEMON_APP_NAME = uSERVICE_SECURITY.c_str();
+    static const uint64_t vDAEMON_BUS_TIMER = 5000;
 
     class Daemon : public MicroService {
     public:
@@ -38,18 +39,16 @@ namespace OpenWifi {
                         const std::string & ConfigEnv,
                         const std::string & AppName,
                         uint64_t BusTimer,
-                        const SubSystemVec & SubSystems) :
+                        const Types::SubSystemVec & SubSystems) :
                 MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
 
-        void PostInitialization(Poco::Util::Application &self);
+        void initialize(Poco::Util::Application &self) override;
         static Daemon *instance();
-        inline const std::string & AssetDir() { return AssetDir_; }
     private:
-        static Daemon 		*instance_;
-        std::string         AssetDir_;
+        static Daemon 				*instance_;
     };
 
     inline Daemon * Daemon() { return Daemon::instance(); }
-    void DaemonPostInitialization(Poco::Util::Application &self);
 }
 
+#endif //UCENTRALSEC_DAEMON_H

src/KafkaManager.cpp

@@ -0,0 +1,221 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+#include <thread>
+
+#include "KafkaManager.h"
+
+#include "Daemon.h"
+#include "Utils.h"
+
+namespace OpenWifi {
+
+	class KafkaManager *KafkaManager::instance_ = nullptr;
+
+	KafkaManager::KafkaManager() noexcept:
+		SubSystemServer("KafkaManager", "KAFKA-SVR", "openwifi.kafka")
+	{
+	}
+
+	void KafkaManager::initialize(Poco::Util::Application & self) {
+		SubSystemServer::initialize(self);
+		KafkaEnabled_ = Daemon()->ConfigGetBool("openwifi.kafka.enable",false);
+	}
+
+#ifdef SMALL_BUILD
+
+	int KafkaManager::Start() {
+		return 0;
+	}
+	void KafkaManager::Stop() {
+	}
+
+#else
+
+	int KafkaManager::Start() {
+		if(!KafkaEnabled_)
+			return 0;
+		ProducerThr_ = std::make_unique<std::thread>([this]() { this->ProducerThr(); });
+		ConsumerThr_ = std::make_unique<std::thread>([this]() { this->ConsumerThr(); });
+		return 0;
+	}
+
+	void KafkaManager::Stop() {
+		if(KafkaEnabled_) {
+			ProducerRunning_ = ConsumerRunning_ = false;
+			ProducerThr_->join();
+			ConsumerThr_->join();
+			return;
+		}
+	}
+
+	void KafkaManager::ProducerThr() {
+		cppkafka::Configuration Config({
+										   { "client.id", Daemon()->ConfigGetString("openwifi.kafka.client.id") },
+										   { "metadata.broker.list", Daemon()->ConfigGetString("openwifi.kafka.brokerlist") }
+									   });
+		SystemInfoWrapper_ = 	R"lit({ "system" : { "id" : )lit" +
+								  	std::to_string(Daemon()->ID()) +
+									R"lit( , "host" : ")lit" + Daemon()->PrivateEndPoint() +
+									R"lit(" } , "payload" : )lit" ;
+		cppkafka::Producer	Producer(Config);
+		ProducerRunning_ = true;
+		while(ProducerRunning_) {
+			std::this_thread::sleep_for(std::chrono::milliseconds(200));
+			try
+			{
+				std::lock_guard G(ProducerMutex_);
+				auto Num=0;
+				while (!Queue_.empty()) {
+					const auto M = Queue_.front();
+					Producer.produce(
+						cppkafka::MessageBuilder(M.Topic).key(M.Key).payload(M.PayLoad));
+					Queue_.pop();
+					Num++;
+				}
+				if(Num)
+					Producer.flush();
+			} catch (const cppkafka::HandleException &E ) {
+				Logger_.warning(Poco::format("Caught a Kafka exception (producer): %s",std::string{E.what()}));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			}
+		}
+	}
+
+	void KafkaManager::PartitionAssignment(const cppkafka::TopicPartitionList& partitions) {
+		Logger_.information(Poco::format("Partition assigned: %Lu...",(uint64_t )partitions.front().get_partition()));
+	}
+	void KafkaManager::PartitionRevocation(const cppkafka::TopicPartitionList& partitions) {
+		Logger_.information(Poco::format("Partition revocation: %Lu...",(uint64_t )partitions.front().get_partition()));
+	}
+
+	void KafkaManager::ConsumerThr() {
+		cppkafka::Configuration Config({
+										   { "client.id", Daemon()->ConfigGetString("openwifi.kafka.client.id") },
+										   { "metadata.broker.list", Daemon()->ConfigGetString("openwifi.kafka.brokerlist") },
+										   { "group.id", Daemon()->ConfigGetString("openwifi.kafka.group.id") },
+										   { "enable.auto.commit", Daemon()->ConfigGetBool("openwifi.kafka.auto.commit",false) },
+										   { "auto.offset.reset", "latest" } ,
+										   { "enable.partition.eof", false }
+									   });
+
+		cppkafka::TopicConfiguration topic_config = {
+			{ "auto.offset.reset", "smallest" }
+		};
+
+		// Now configure it to be the default topic config
+		Config.set_default_topic_configuration(topic_config);
+
+		cppkafka::Consumer Consumer(Config);
+		Consumer.set_assignment_callback([this](cppkafka::TopicPartitionList& partitions) {
+			if(!partitions.empty()) {
+				Logger_.information(Poco::format("Partition assigned: %Lu...",
+												 (uint64_t)partitions.front().get_partition()));
+			}
+		});
+		Consumer.set_revocation_callback([this](const cppkafka::TopicPartitionList& partitions) {
+			if(!partitions.empty()) {
+				Logger_.information(Poco::format("Partition revocation: %Lu...",
+												 (uint64_t)partitions.front().get_partition()));
+			}
+		});
+
+        bool AutoCommit = Daemon()->ConfigGetBool("openwifi.kafka.auto.commit",false);
+        auto BatchSize = Daemon()->ConfigGetInt("openwifi.kafka.consumer.batchsize",20);
+
+        Types::StringVec    Topics;
+		for(const auto &i:Notifiers_)
+			Topics.push_back(i.first);
+
+		Consumer.subscribe(Topics);
+
+		ConsumerRunning_ = true;
+		while(ConsumerRunning_) {
+			try {
+				std::vector<cppkafka::Message> MsgVec = Consumer.poll_batch(BatchSize, std::chrono::milliseconds(200));
+				for(auto const &Msg:MsgVec) {
+                    if (!Msg)
+                        continue;
+                    if (Msg.get_error()) {
+                        if (!Msg.is_eof()) {
+                            Logger_.error(Poco::format("Error: %s", Msg.get_error().to_string()));
+                        }if(!AutoCommit)
+                            Consumer.async_commit(Msg);
+                        continue;
+                    }
+                    std::lock_guard G(ConsumerMutex_);
+                    auto It = Notifiers_.find(Msg.get_topic());
+                    if (It != Notifiers_.end()) {
+                        Types::TopicNotifyFunctionList &FL = It->second;
+                        std::string Key{Msg.get_key()};
+                        std::string Payload{Msg.get_payload()};
+                        for (auto &F : FL) {
+                            std::thread T(F.first, Key, Payload);
+                            T.detach();
+                        }
+                    }
+                    if (!AutoCommit)
+                        Consumer.async_commit(Msg);
+                }
+			} catch (const cppkafka::HandleException &E) {
+				Logger_.warning(Poco::format("Caught a Kafka exception (consumer): %s",std::string{E.what()}));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			}
+		}
+	}
+
+	std::string KafkaManager::WrapSystemId(const std::string & PayLoad) {
+		return std::move( SystemInfoWrapper_ + PayLoad + "}");
+	}
+
+	void KafkaManager::PostMessage(const std::string &topic, const std::string & key, const std::string &PayLoad, bool WrapMessage ) {
+		if(KafkaEnabled_) {
+			std::lock_guard G(Mutex_);
+			KMessage M{
+				.Topic = topic,
+				.Key = key,
+				.PayLoad = WrapMessage ? WrapSystemId(PayLoad) : PayLoad };
+			Queue_.push(M);
+		}
+	}
+
+	int KafkaManager::RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F) {
+		if(KafkaEnabled_) {
+			std::lock_guard G(Mutex_);
+			auto It = Notifiers_.find(Topic);
+			if(It == Notifiers_.end()) {
+				Types::TopicNotifyFunctionList L;
+				L.emplace(L.end(),std::make_pair(F,FunctionId_));
+				Notifiers_[Topic] = std::move(L);
+			} else {
+				It->second.emplace(It->second.end(),std::make_pair(F,FunctionId_));
+			}
+			return FunctionId_++;
+		} else {
+			return 0;
+		}
+	}
+
+	void KafkaManager::UnregisterTopicWatcher(const std::string &Topic, int Id) {
+		if(KafkaEnabled_) {
+			std::lock_guard G(Mutex_);
+			auto It = Notifiers_.find(Topic);
+			if(It != Notifiers_.end()) {
+				Types::TopicNotifyFunctionList & L = It->second;
+				for(auto it=L.begin(); it!=L.end(); it++)
+					if(it->second == Id) {
+						L.erase(it);
+						break;
+					}
+			}
+		}
+	}
+
+#endif
+} // namespace

src/KafkaManager.h

@@ -0,0 +1,74 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_KAFKAMANAGER_H
+#define UCENTRALGW_KAFKAMANAGER_H
+
+#include <queue>
+#include <thread>
+
+#include "SubSystemServer.h"
+#include "OpenWifiTypes.h"
+
+#include "cppkafka/cppkafka.h"
+
+namespace OpenWifi {
+
+	class KafkaManager : public SubSystemServer {
+	  public:
+
+		struct KMessage {
+					std::string Topic,
+								Key,
+								PayLoad;
+		};
+
+		void initialize(Poco::Util::Application & self) override;
+		static KafkaManager *instance() {
+			if(instance_== nullptr)
+				instance_ = new KafkaManager;
+			return instance_;
+		}
+
+		void ProducerThr();
+		void ConsumerThr();
+
+		int Start() override;
+		void Stop() override;
+
+		void PostMessage(const std::string &topic, const std::string & key, const std::string &payload, bool WrapMessage = true);
+		[[nodiscard]] std::string WrapSystemId(const std::string & PayLoad);
+		[[nodiscard]] bool Enabled() { return KafkaEnabled_; }
+		int RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction & F);
+		void UnregisterTopicWatcher(const std::string &Topic, int FunctionId);
+		void WakeUp();
+		void PartitionAssignment(const cppkafka::TopicPartitionList& partitions);
+		void PartitionRevocation(const cppkafka::TopicPartitionList& partitions);
+
+	  private:
+		static KafkaManager 			*instance_;
+		std::mutex 						ProducerMutex_;
+		std::mutex						ConsumerMutex_;
+		bool 							KafkaEnabled_ = false;
+		std::atomic_bool 				ProducerRunning_ = false;
+		std::atomic_bool 				ConsumerRunning_ = false;
+		std::queue<KMessage>			Queue_;
+		std::string 					SystemInfoWrapper_;
+		std::unique_ptr<std::thread>	ConsumerThr_;
+		std::unique_ptr<std::thread>	ProducerThr_;
+		int                       		FunctionId_=1;
+		Types::NotifyTable        		Notifiers_;
+		std::unique_ptr<cppkafka::Configuration>    Config_;
+
+		KafkaManager() noexcept;
+	};
+
+	inline KafkaManager * KafkaManager() { return KafkaManager::instance(); }
+}	// NameSpace
+
+#endif // UCENTRALGW_KAFKAMANAGER_H

src/Kafka_topics.h

@@ -1,14 +1,10 @@
 //
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
+// Created by stephane bourque on 2021-06-07.
 //
 
-#pragma once
+#ifndef UCENTRALGW_KAFKA_TOPICS_H
+#define UCENTRALGW_KAFKA_TOPICS_H
 
-#include <string>
 namespace OpenWifi::KafkaTopics {
 	static const std::string HEALTHCHECK{"healthcheck"};
 	static const std::string STATE{"state"};
@@ -18,8 +14,6 @@ namespace OpenWifi::KafkaTopics {
 	static const std::string COMMAND{"command"};
 	static const std::string SERVICE_EVENTS{"service_events"};
 	static const std::string DEVICE_EVENT_QUEUE{"device_event_queue"};
-	static const std::string DEVICE_TELEMETRY{"device_telemetry"};
-    static const std::string PROVISIONING_CHANGE{"provisioning_change"};
 
 	namespace ServiceEvents {
 		static const std::string EVENT_JOIN{"join"};
@@ -40,3 +34,4 @@ namespace OpenWifi::KafkaTopics {
 	}
 }
 
+#endif // UCENTRALGW_KAFKA_TOPICS_H

src/MFAServer.cpp

@@ -1,116 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-11.
-//
-
-#include "MFAServer.h"
-#include "SMSSender.h"
-#include "SMTPMailerService.h"
-#include "AuthService.h"
-#include "TotpCache.h"
-
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
-
-namespace OpenWifi {
-
-    int MFAServer::Start() {
-        return 0;
-    }
-
-    void MFAServer::Stop() {
-    }
-
-    bool MFAServer::StartMFAChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, Poco::JSON::Object &ChallengeStart) {
-        std::lock_guard G(Mutex_);
-
-        CleanCache();
-
-        if(!MethodEnabled(UInfo.userinfo.userTypeProprietaryInfo.mfa.method))
-            return false;
-
-        std::string Challenge = MakeChallenge();
-        std::string uuid = MicroServiceCreateUUID();
-        uint64_t Created = Utils::Now();
-
-        ChallengeStart.set("uuid",uuid);
-        ChallengeStart.set("created", Created);
-        ChallengeStart.set("question", "mfa challenge");
-        ChallengeStart.set("method", UInfo.userinfo.userTypeProprietaryInfo.mfa.method);
-
-        Cache_[uuid] = MFACacheEntry{ .UInfo = UInfo, .Answer=Challenge, .Created=Created, .Method=UInfo.userinfo.userTypeProprietaryInfo.mfa.method };
-        return SendChallenge(UInfo, UInfo.userinfo.userTypeProprietaryInfo.mfa.method, Challenge);
-    }
-
-    bool MFAServer::SendChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, const std::string &Method, const std::string &Challenge) {
-        if(Method==MFAMETHODS::SMS && SMSSender()->Enabled() && !UInfo.userinfo.userTypeProprietaryInfo.mobiles.empty()) {
-            std::string Message = "This is your login code: " + Challenge + " Please enter this in your login screen.";
-            return SMSSender()->Send(UInfo.userinfo.userTypeProprietaryInfo.mobiles[0].number, Message);
-        } else if(Method==MFAMETHODS::EMAIL && SMTPMailerService()->Enabled() && !UInfo.userinfo.email.empty()) {
-            return AuthService()->SendEmailChallengeCode(UInfo,Challenge);
-        } else if(Method==MFAMETHODS::AUTHENTICATOR && !UInfo.userinfo.userTypeProprietaryInfo.authenticatorSecret.empty()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    bool MFAServer::ResendCode(const std::string &uuid) {
-        std::lock_guard G(Mutex_);
-        auto Hint = Cache_.find(uuid);
-        if(Hint==Cache_.end())
-            return false;
-        return SendChallenge(Hint->second.UInfo, Hint->second.Method, Hint->second.Answer);
-    }
-
-    bool MFAServer::CompleteMFAChallenge(const Poco::JSON::Object::Ptr &ChallengeResponse, SecurityObjects::UserInfoAndPolicy &UInfo) {
-        std::lock_guard G(Mutex_);
-
-        if(!ChallengeResponse->has("uuid") || !ChallengeResponse->has("answer"))
-            return false;
-
-        auto uuid = ChallengeResponse->get("uuid").toString();
-        auto Hint = Cache_.find(uuid);
-        if(Hint == end(Cache_)) {
-            return false;
-        }
-
-        auto answer = ChallengeResponse->get("answer").toString();
-        std::string Expecting;
-        if(Hint->second.Method==MFAMETHODS::AUTHENTICATOR) {
-            if(!TotpCache()->ValidateCode(Hint->second.UInfo.userinfo.userTypeProprietaryInfo.authenticatorSecret,answer, Expecting)) {
-                return false;
-            }
-        } else if(Hint->second.Answer!=answer) {
-            return false;
-        }
-
-        UInfo = Hint->second.UInfo;
-        Cache_.erase(Hint);
-        return true;
-    }
-
-    bool MFAServer::MethodEnabled(const std::string &Method) {
-        if(Method==MFAMETHODS::SMS)
-            return SMSSender()->Enabled();
-
-        if(Method==MFAMETHODS::EMAIL)
-            return SMTPMailerService()->Enabled();
-
-        if(Method==MFAMETHODS::AUTHENTICATOR)
-            return true;
-
-        return false;
-    }
-
-    void MFAServer::CleanCache() {
-        // it is assumed that you have locked Cache_ at this point.
-        uint64_t Now = Utils::Now();
-        for(auto i=begin(Cache_);i!=end(Cache_);) {
-            if((Now-i->second.Created)>300) {
-                i = Cache_.erase(i);
-            } else {
-                ++i;
-            }
-        }
-    }
-}

src/MFAServer.h

@@ -1,67 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-11.
-//
-
-#pragma once
-
-#include "Poco/JSON/Object.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/SubSystemServer.h"
-#include "framework/MicroServiceFuncs.h"
-
-#include "fmt/format.h"
-
-namespace OpenWifi {
-
-    namespace MFAMETHODS {
-        inline const static std::string SMS{"sms"};
-        inline const static std::string EMAIL{"email"};
-        inline const static std::string AUTHENTICATOR{"authenticator"};
-        inline const static std::vector<std::string> Methods{ SMS, EMAIL, AUTHENTICATOR };
-        inline bool Validate(const std::string &M) {
-            return std::find(cbegin(Methods), cend(Methods),M)!=Methods.end();
-        }
-    }
-
-    struct MFACacheEntry {
-        SecurityObjects::UserInfoAndPolicy  UInfo;
-        std::string                         Answer;
-        uint64_t                            Created;
-        std::string                         Method;
-    };
-
-
-    typedef std::map<std::string,MFACacheEntry>     MFAChallengeCache;
-
-    class MFAServer : public SubSystemServer{
-    public:
-        int Start() override;
-        void Stop() override;
-        static auto instance() {
-            static auto instance_ = new MFAServer;
-            return instance_;
-        }
-
-        bool StartMFAChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, Poco::JSON::Object &Challenge);
-        bool CompleteMFAChallenge(const Poco::JSON::Object::Ptr &ChallengeResponse, SecurityObjects::UserInfoAndPolicy &UInfo);
-        static bool MethodEnabled(const std::string &Method);
-        bool ResendCode(const std::string &uuid);
-        static bool SendChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, const std::string &Method, const std::string &Challenge);
-
-        static inline std::string MakeChallenge() {
-            return fmt::format("{0:06}" , MicroServiceRandom(1,999999) );
-        }
-
-    private:
-        MFAChallengeCache   Cache_;
-        MFAServer() noexcept:
-            SubSystemServer("MFServer", "MFA-SVR", "mfa")
-            {
-            }
-
-        void CleanCache();
-    };
-
-    inline auto MFAServer() { return MFAServer::instance(); }
-}
-

src/MessagingTemplates.cpp

@@ -1,8 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-25.
-//
-
-#include "MessagingTemplates.h"
-
-namespace OpenWifi {
-} // OpenWifi

src/MessagingTemplates.h

@@ -1,75 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-25.
-//
-
-#pragma once
-
-#include <string>
-#include <vector>
-
-namespace OpenWifi {
-
-    class MessagingTemplates {
-    public:
-        static MessagingTemplates & instance() {
-            static auto instance = new MessagingTemplates;
-            return *instance;
-        }
-
-        enum EMAIL_REASON {
-            FORGOT_PASSWORD = 0,
-            EMAIL_VERIFICATION,
-            SUB_SIGNUP_VERIFICATION,
-            EMAIL_INVITATION,
-            VERIFICATION_CODE,
-            SUB_FORGOT_PASSWORD,
-            SUB_EMAIL_VERIFICATION,
-            SUB_VERIFICATION_CODE
-        };
-
-        static std::string AddOperator(const std::string & filename, const std::string &OperatorName) {
-            if(OperatorName.empty())
-                return "/" + filename;
-            return "/" + OperatorName + "/" + filename;
-        }
-
-        static std::string TemplateName( EMAIL_REASON r , const std::string &OperatorName="") {
-            switch (r) {
-                case FORGOT_PASSWORD: return AddOperator(EmailTemplateNames[FORGOT_PASSWORD],OperatorName);
-                case EMAIL_VERIFICATION: return AddOperator(EmailTemplateNames[EMAIL_VERIFICATION],OperatorName);
-                case SUB_SIGNUP_VERIFICATION: return AddOperator(EmailTemplateNames[SUB_SIGNUP_VERIFICATION],OperatorName);
-                case EMAIL_INVITATION: return AddOperator(EmailTemplateNames[EMAIL_INVITATION],OperatorName);
-                case VERIFICATION_CODE: return AddOperator(EmailTemplateNames[VERIFICATION_CODE],OperatorName);
-                case SUB_FORGOT_PASSWORD: return AddOperator(EmailTemplateNames[SUB_FORGOT_PASSWORD],OperatorName);
-                case SUB_EMAIL_VERIFICATION: return AddOperator(EmailTemplateNames[SUB_EMAIL_VERIFICATION],OperatorName);
-                case SUB_VERIFICATION_CODE: return AddOperator(EmailTemplateNames[SUB_VERIFICATION_CODE],OperatorName);
-                default:
-                    return "";
-            }
-        }
-
-        static std::string Logo(const std::string &OperatorName = "" ) {
-            return AddOperator("logo.png", OperatorName);
-        }
-
-        static std::string SubLogo(const std::string &OperatorName = "" ) {
-            return AddOperator("sub_logo.png", OperatorName);
-        }
-
-    private:
-        inline const static std::vector<std::string>  EmailTemplateNames = {
-                "password_reset",
-                "email_verification",
-                "sub_signup_verification",
-                "email_invitation",
-                "verification_code",
-                "sub_password_reset",
-                "sub_email_verification",
-                "sub_verification_code"
-        };
-    };
-
-    inline MessagingTemplates & MessagingTemplates() { return MessagingTemplates::instance(); }
-
-} // OpenWifi
-

src/MicroService.cpp

@@ -0,0 +1,532 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include <cstdlib>
+#include <boost/algorithm/string.hpp>
+
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/Util/HelpFormatter.h"
+#include "Poco/Environment.h"
+#include "Poco/Net/HTTPSStreamFactory.h"
+#include "Poco/Net/HTTPStreamFactory.h"
+#include "Poco/Net/FTPSStreamFactory.h"
+#include "Poco/Net/FTPStreamFactory.h"
+#include "Poco/Path.h"
+#include "Poco/File.h"
+#include "Poco/String.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/JSON/Parser.h"
+#include "Poco/JSON/Stringifier.h"
+
+#include "ALBHealthCheckServer.h"
+#ifndef SMALL_BUILD
+#include "KafkaManager.h"
+#endif
+#include "Kafka_topics.h"
+
+#include "MicroService.h"
+#include "Utils.h"
+
+#ifndef TIP_SECURITY_SERVICE
+#include "AuthClient.h"
+#endif
+
+namespace OpenWifi {
+
+	void MyErrorHandler::exception(const Poco::Exception & E) {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().log(E);
+		App_.logger().error(Poco::format("Exception occurred in %s",CurrentThread->getName()));
+	}
+
+	void MyErrorHandler::exception(const std::exception & E) {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().warning(Poco::format("std::exception on %s",CurrentThread->getName()));
+	}
+
+	void MyErrorHandler::exception() {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().warning(Poco::format("exception on %s",CurrentThread->getName()));
+	}
+
+	void MicroService::Exit(int Reason) {
+		std::exit(Reason);
+	}
+
+	void MicroService::BusMessageReceived(const std::string &Key, const std::string & Message) {
+		std::lock_guard G(InfraMutex_);
+		try {
+			Poco::JSON::Parser P;
+			auto Object = P.parse(Message).extract<Poco::JSON::Object::Ptr>();
+			if (Object->has(KafkaTopics::ServiceEvents::Fields::ID) &&
+				Object->has(KafkaTopics::ServiceEvents::Fields::EVENT)) {
+				uint64_t 	ID = Object->get(KafkaTopics::ServiceEvents::Fields::ID);
+				auto 		Event = Object->get(KafkaTopics::ServiceEvents::Fields::EVENT).toString();
+				if (ID != ID_) {
+					if(	Event==KafkaTopics::ServiceEvents::EVENT_JOIN ||
+						Event==KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE ||
+						Event==KafkaTopics::ServiceEvents::EVENT_LEAVE ) {
+						if(	Object->has(KafkaTopics::ServiceEvents::Fields::TYPE) &&
+						   	Object->has(KafkaTopics::ServiceEvents::Fields::PUBLIC) &&
+							Object->has(KafkaTopics::ServiceEvents::Fields::PRIVATE) &&
+						   	Object->has(KafkaTopics::ServiceEvents::Fields::VRSN) &&
+							Object->has(KafkaTopics::ServiceEvents::Fields::KEY)) {
+
+							if (Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE && Services_.find(ID) != Services_.end()) {
+								Services_[ID].LastUpdate = std::time(nullptr);
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
+								Services_.erase(ID);
+								logger().information(Poco::format("Service %s ID=%Lu leaving system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN || Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE) {
+								logger().information(Poco::format("Service %s ID=%Lu joining system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
+								Services_[ID] = MicroServiceMeta{
+									.Id = ID,
+									.Type = Poco::toLower(Object->get(KafkaTopics::ServiceEvents::Fields::TYPE).toString()),
+									.PrivateEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),
+									.PublicEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PUBLIC).toString(),
+									.AccessKey = Object->get(KafkaTopics::ServiceEvents::Fields::KEY).toString(),
+									.Version = Object->get(KafkaTopics::ServiceEvents::Fields::VRSN).toString(),
+									.LastUpdate = (uint64_t)std::time(nullptr)};
+								for (const auto &[Id, Svc] : Services_) {
+									logger().information(Poco::format("ID: %Lu Type: %s EndPoint: %s",Id,Svc.Type,Svc.PrivateEndPoint));
+								}
+							}
+						} else {
+							logger().error(Poco::format("KAFKA-MSG: invalid event '%s', missing a field.",Event));
+						}
+					} else if (Event==KafkaTopics::ServiceEvents::EVENT_REMOVE_TOKEN) {
+						if(Object->has(KafkaTopics::ServiceEvents::Fields::TOKEN)) {
+#ifndef TIP_SECURITY_SERVICE
+							AuthClient()->RemovedCachedToken(Object->get(KafkaTopics::ServiceEvents::Fields::TOKEN).toString());
+#endif
+						} else {
+							logger().error(Poco::format("KAFKA-MSG: invalid event '%s', missing token",Event));
+						}
+					} else {
+						logger().error(Poco::format("Unknown Event: %s Source: %Lu", Event, ID));
+					}
+				}
+			} else {
+				logger().error("Bad bus message.");
+			}
+
+			auto i=Services_.begin();
+			auto Now = (uint64_t )std::time(nullptr);
+			for(;i!=Services_.end();) {
+			    if((Now - i->second.LastUpdate)>60) {
+			        i = Services_.erase(i);
+			    } else
+			        ++i;
+			}
+
+		} catch (const Poco::Exception &E) {
+			logger().log(E);
+		}
+	}
+
+	MicroServiceMetaVec MicroService::GetServices(const std::string & Type) {
+		std::lock_guard G(InfraMutex_);
+
+		auto T = Poco::toLower(Type);
+		MicroServiceMetaVec	Res;
+		for(const auto &[Id,ServiceRec]:Services_) {
+			if(ServiceRec.Type==T)
+				Res.push_back(ServiceRec);
+		}
+		return Res;
+	}
+
+	MicroServiceMetaVec MicroService::GetServices() {
+		std::lock_guard G(InfraMutex_);
+
+		MicroServiceMetaVec	Res;
+		for(const auto &[Id,ServiceRec]:Services_) {
+			Res.push_back(ServiceRec);
+		}
+		return Res;
+	}
+
+    void MicroService::LoadConfigurationFile() {
+	    std::string Location = Poco::Environment::get(DAEMON_CONFIG_ENV_VAR,".");
+	    Poco::Path ConfigFile;
+
+	    ConfigFile = ConfigFileName_.empty() ? Location + "/" + DAEMON_PROPERTIES_FILENAME : ConfigFileName_;
+
+	    if(!ConfigFile.isFile())
+	    {
+	        std::cerr << DAEMON_APP_NAME << ": Configuration "
+	        << ConfigFile.toString() << " does not seem to exist. Please set " + DAEMON_CONFIG_ENV_VAR
+	        + " env variable the path of the " + DAEMON_PROPERTIES_FILENAME + " file." << std::endl;
+	        std::exit(Poco::Util::Application::EXIT_CONFIG);
+	    }
+
+	    loadConfiguration(ConfigFile.toString());
+	}
+
+    void MicroService::Reload() {
+	    LoadConfigurationFile();
+	    LoadMyConfig();
+	}
+
+    void MicroService::LoadMyConfig() {
+	    std::string KeyFile = ConfigPath("openwifi.service.key");
+	    std::string KeyFilePassword = ConfigPath("openwifi.service.key.password" , "" );
+	    AppKey_ = Poco::SharedPtr<Poco::Crypto::RSAKey>(new Poco::Crypto::RSAKey("", KeyFile, KeyFilePassword));
+	    Cipher_ = CipherFactory_.createCipher(*AppKey_);
+	    ID_ = Utils::GetSystemId();
+	    if(!DebugMode_)
+	        DebugMode_ = ConfigGetBool("openwifi.system.debug",false);
+	    MyPrivateEndPoint_ = ConfigGetString("openwifi.system.uri.private");
+	    MyPublicEndPoint_ = ConfigGetString("openwifi.system.uri.public");
+	    UIURI_ = ConfigGetString("openwifi.system.uri.ui");
+	    MyHash_ = CreateHash(MyPublicEndPoint_);
+	}
+
+	void MicroService::initialize(Poco::Util::Application &self) {
+		// add the default services
+		SubSystems_.push_back(KafkaManager());
+		SubSystems_.push_back(ALBHealthCheckServer());
+
+		Poco::Net::initializeSSL();
+		Poco::Net::HTTPStreamFactory::registerFactory();
+		Poco::Net::HTTPSStreamFactory::registerFactory();
+		Poco::Net::FTPStreamFactory::registerFactory();
+		Poco::Net::FTPSStreamFactory::registerFactory();
+
+		LoadConfigurationFile();
+
+        static const char * LogFilePathKey = "logging.channels.c2.path";
+
+		if(LogDir_.empty()) {
+			std::string OriginalLogFileValue = ConfigPath(LogFilePathKey);
+			config().setString(LogFilePathKey, OriginalLogFileValue);
+		} else {
+			config().setString(LogFilePathKey, LogDir_);
+		}
+
+		Poco::File	DataDir(ConfigPath("openwifi.system.data"));
+		DataDir_ = DataDir.path();
+		if(!DataDir.exists()) {
+			try {
+				DataDir.createDirectory();
+			} catch (const Poco::Exception &E) {
+				logger().log(E);
+			}
+		}
+
+		LoadMyConfig();
+
+		InitializeSubSystemServers();
+		ServerApplication::initialize(self);
+
+		Types::TopicNotifyFunction F = [this](std::string s1,std::string s2) { this->BusMessageReceived(s1,s2); };
+		KafkaManager()->RegisterTopicWatcher(KafkaTopics::SERVICE_EVENTS, F);
+	}
+
+	void MicroService::uninitialize() {
+		// add your own uninitialization code here
+		ServerApplication::uninitialize();
+	}
+
+	void MicroService::reinitialize(Poco::Util::Application &self) {
+		ServerApplication::reinitialize(self);
+		// add your own reinitialization code here
+	}
+
+	void MicroService::defineOptions(Poco::Util::OptionSet &options) {
+		ServerApplication::defineOptions(options);
+
+		options.addOption(
+			Poco::Util::Option("help", "", "display help information on command line arguments")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleHelp)));
+
+		options.addOption(
+			Poco::Util::Option("file", "", "specify the configuration file")
+				.required(false)
+				.repeatable(false)
+				.argument("file")
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleConfig)));
+
+		options.addOption(
+			Poco::Util::Option("debug", "", "to run in debug, set to true")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleDebug)));
+
+		options.addOption(
+			Poco::Util::Option("logs", "", "specify the log directory and file (i.e. dir/file.log)")
+				.required(false)
+				.repeatable(false)
+				.argument("dir")
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleLogs)));
+
+		options.addOption(
+			Poco::Util::Option("version", "", "get the version and quit.")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleVersion)));
+
+	}
+
+	void MicroService::handleHelp(const std::string &name, const std::string &value) {
+		HelpRequested_ = true;
+		displayHelp();
+		stopOptionsProcessing();
+	}
+
+	void MicroService::handleVersion(const std::string &name, const std::string &value) {
+		HelpRequested_ = true;
+		std::cout << Version() << std::endl;
+		stopOptionsProcessing();
+	}
+
+	void MicroService::handleDebug(const std::string &name, const std::string &value) {
+		if(value == "true")
+			DebugMode_ = true ;
+	}
+
+	void MicroService::handleLogs(const std::string &name, const std::string &value) {
+		LogDir_ = value;
+	}
+
+	void MicroService::handleConfig(const std::string &name, const std::string &value) {
+		ConfigFileName_ = value;
+	}
+
+	void MicroService::displayHelp() {
+		Poco::Util::HelpFormatter helpFormatter(options());
+		helpFormatter.setCommand(commandName());
+		helpFormatter.setUsage("OPTIONS");
+		helpFormatter.setHeader("A " + DAEMON_APP_NAME + " implementation for TIP.");
+		helpFormatter.format(std::cout);
+	}
+
+	void MicroService::InitializeSubSystemServers() {
+		for(auto i:SubSystems_)
+			addSubsystem(i);
+	}
+
+	void MicroService::StartSubSystemServers() {
+		for(auto i:SubSystems_) {
+			i->Start();
+		}
+		BusEventManager_.Start();
+	}
+
+	void MicroService::StopSubSystemServers() {
+		BusEventManager_.Stop();
+		for(auto i=SubSystems_.rbegin(); i!=SubSystems_.rend(); ++i)
+			(*i)->Stop();
+	}
+
+	std::string MicroService::CreateUUID() {
+		return UUIDGenerator_.create().toString();
+	}
+
+	bool MicroService::SetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level) {
+		try {
+			auto P = Poco::Logger::parseLevel(Level);
+			auto Sub = Poco::toLower(SubSystem);
+
+			if (Sub == "all") {
+				for (auto i : SubSystems_) {
+					i->Logger().setLevel(P);
+				}
+				return true;
+			} else {
+				// std::cout << "Sub:" << SubSystem << " Level:" << Level << std::endl;
+				for (auto i : SubSystems_) {
+					if (Sub == Poco::toLower(i->Name())) {
+						i->Logger().setLevel(P);
+						return true;
+					}
+				}
+			}
+		} catch (const Poco::Exception & E) {
+			std::cout << "Exception" << std::endl;
+		}
+		return false;
+	}
+
+	void MicroService::Reload(const std::string &Sub) {
+		for (auto i : SubSystems_) {
+			if (Poco::toLower(Sub) == Poco::toLower(i->Name())) {
+				i->reinitialize(Poco::Util::Application::instance());
+				return;
+			}
+		}
+	}
+
+	Types::StringVec MicroService::GetSubSystems() const {
+		Types::StringVec Result;
+		for(auto i:SubSystems_)
+			Result.push_back(Poco::toLower(i->Name()));
+		return Result;
+	}
+
+	Types::StringPairVec MicroService::GetLogLevels() {
+		Types::StringPairVec Result;
+
+		for(auto &i:SubSystems_) {
+			auto P = std::make_pair( i->Name(), Utils::LogLevelToString(i->GetLoggingLevel()));
+			Result.push_back(P);
+		}
+		return Result;
+	}
+
+	const Types::StringVec & MicroService::GetLogLevelNames() {
+		static Types::StringVec LevelNames{"none", "fatal", "critical", "error", "warning", "notice", "information", "debug", "trace" };
+		return LevelNames;
+	}
+
+	uint64_t MicroService::ConfigGetInt(const std::string &Key,uint64_t Default) {
+		return (uint64_t) config().getInt64(Key,Default);
+	}
+
+	uint64_t MicroService::ConfigGetInt(const std::string &Key) {
+		return config().getInt(Key);
+	}
+
+	uint64_t MicroService::ConfigGetBool(const std::string &Key,bool Default) {
+		return config().getBool(Key,Default);
+	}
+
+	uint64_t MicroService::ConfigGetBool(const std::string &Key) {
+		return config().getBool(Key);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key,const std::string & Default) {
+		return config().getString(Key, Default);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key) {
+		return config().getString(Key);
+	}
+
+	std::string MicroService::ConfigPath(const std::string &Key,const std::string & Default) {
+		std::string R = config().getString(Key, Default);
+		return Poco::Path::expand(R);
+	}
+
+	std::string MicroService::ConfigPath(const std::string &Key) {
+		std::string R = config().getString(Key);
+		return Poco::Path::expand(R);
+	}
+
+	std::string MicroService::Encrypt(const std::string &S) {
+		return Cipher_->encryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
+	}
+
+	std::string MicroService::Decrypt(const std::string &S) {
+		return Cipher_->decryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
+	}
+
+	std::string MicroService::CreateHash(const std::string &S) {
+		SHA2_.update(S);
+		return Utils::ToHex(SHA2_.digest());
+	}
+
+	std::string MicroService::MakeSystemEventMessage( const std::string & Type ) const {
+		Poco::JSON::Object	Obj;
+		Obj.set(KafkaTopics::ServiceEvents::Fields::EVENT,Type);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::ID,ID_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::TYPE,Poco::toLower(DAEMON_APP_NAME));
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PUBLIC,MyPublicEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PRIVATE,MyPrivateEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::KEY,MyHash_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::VRSN,Version_);
+		std::stringstream ResultText;
+		Poco::JSON::Stringifier::stringify(Obj, ResultText);
+		return ResultText.str();
+	}
+
+	void BusEventManager::run() {
+		Running_ = true;
+		auto Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN);
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+		while(Running_) {
+			Poco::Thread::trySleep((unsigned long)Daemon()->DaemonBusTimer());
+			if(!Running_)
+				break;
+			Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE);
+			KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+		}
+		Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE);
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+	};
+
+	void BusEventManager::Start() {
+		if(KafkaManager()->Enabled()) {
+			Thread_.start(*this);
+		}
+	}
+
+	void BusEventManager::Stop() {
+		if(KafkaManager()->Enabled()) {
+			Running_ = false;
+			Thread_.wakeUp();
+			Thread_.join();
+		}
+	}
+
+	[[nodiscard]] bool MicroService::IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request) {
+		try {
+			auto APIKEY = Request.get("X-API-KEY");
+			return APIKEY == MyHash_;
+		} catch (const Poco::Exception &E) {
+			logger().log(E);
+		}
+		return false;
+	}
+
+	void MicroService::SavePID() {
+		try {
+			std::ofstream O;
+			O.open(Daemon()->DataDir() + "/pidfile",std::ios::binary | std::ios::trunc);
+			O << Poco::Process::id();
+			O.close();
+		} catch (...)
+		{
+			std::cout << "Could not save system ID" << std::endl;
+		}
+	}
+
+	int MicroService::main(const ArgVec &args) {
+
+		MyErrorHandler	ErrorHandler(*this);
+		Poco::ErrorHandler::set(&ErrorHandler);
+
+		if (!HelpRequested_) {
+			SavePID();
+			Poco::Logger &logger = Poco::Logger::get(DAEMON_APP_NAME);
+			logger.notice(Poco::format("Starting %s version %s.",DAEMON_APP_NAME, Version()));
+
+			if(Poco::Net::Socket::supportsIPv6())
+				logger.information("System supports IPv6.");
+			else
+				logger.information("System does NOT support IPv6.");
+
+			if (config().getBool("application.runAsDaemon", false)) {
+				logger.information("Starting as a daemon.");
+			}
+			logger.information(Poco::format("System ID set to %Lu",ID_));
+			StartSubSystemServers();
+			waitForTerminationRequest();
+			StopSubSystemServers();
+
+			logger.notice(Poco::format("Stopped %s...",DAEMON_APP_NAME));
+		}
+
+		return Application::EXIT_OK;
+	}
+}

src/MicroService.h

@@ -0,0 +1,183 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_MICROSERVICE_H
+#define UCENTRALGW_MICROSERVICE_H
+
+#include <array>
+#include <iostream>
+#include <cstdlib>
+#include <vector>
+#include <set>
+
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/UUIDGenerator.h"
+#include "Poco/ErrorHandler.h"
+#include "Poco/Crypto/RSAKey.h"
+#include "Poco/Crypto/CipherFactory.h"
+#include "Poco/Crypto/Cipher.h"
+#include "Poco/SHA2Engine.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Process.h"
+
+#include "OpenWifiTypes.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+	static const std::string uSERVICE_SECURITY{"owsec"};
+	static const std::string uSERVICE_GATEWAY{"owgw"};
+	static const std::string uSERVICE_FIRMWARE{ "owfms"};
+    static const std::string uSERVICE_TOPOLOGY{ "owtopo"};
+    static const std::string uSERVICE_PROVISIONING{ "owprov"};
+    static const std::string uSERVICE_OWLS{ "owls"};
+
+	class MyErrorHandler : public Poco::ErrorHandler {
+	  public:
+		explicit MyErrorHandler(Poco::Util::Application &App) : App_(App) {}
+		void exception(const Poco::Exception & E) override;
+		void exception(const std::exception & E) override;
+		void exception() override;
+	  private:
+		Poco::Util::Application	&App_;
+	};
+
+	class BusEventManager : public Poco::Runnable {
+	  public:
+		void run() override;
+		void Start();
+		void Stop();
+	  private:
+		std::atomic_bool 	Running_ = false;
+		Poco::Thread		Thread_;
+	};
+
+	struct MicroServiceMeta {
+		uint64_t 		Id=0;
+		std::string 	Type;
+		std::string 	PrivateEndPoint;
+		std::string 	PublicEndPoint;
+		std::string 	AccessKey;
+		std::string		Version;
+		uint64_t 		LastUpdate=0;
+	};
+
+	typedef std::map<uint64_t, MicroServiceMeta>	MicroServiceMetaMap;
+	typedef std::vector<MicroServiceMeta>			MicroServiceMetaVec;
+
+	class MicroService : public Poco::Util::ServerApplication {
+	  public:
+		explicit MicroService( 	std::string PropFile,
+					 	std::string RootEnv,
+					 	std::string ConfigVar,
+					 	std::string AppName,
+					  	uint64_t BusTimer,
+					  	Types::SubSystemVec Subsystems) :
+			DAEMON_PROPERTIES_FILENAME(std::move(PropFile)),
+			DAEMON_ROOT_ENV_VAR(std::move(RootEnv)),
+			DAEMON_CONFIG_ENV_VAR(std::move(ConfigVar)),
+			DAEMON_APP_NAME(std::move(AppName)),
+			DAEMON_BUS_TIMER(BusTimer),
+			SubSystems_(std::move(Subsystems)) {
+		}
+
+		int main(const ArgVec &args) override;
+		void initialize(Application &self) override;
+		void uninitialize() override;
+		void reinitialize(Application &self) override;
+		void defineOptions(Poco::Util::OptionSet &options) override;
+		void handleHelp(const std::string &name, const std::string &value);
+		void handleVersion(const std::string &name, const std::string &value);
+		void handleDebug(const std::string &name, const std::string &value);
+		void handleLogs(const std::string &name, const std::string &value);
+		void handleConfig(const std::string &name, const std::string &value);
+		void displayHelp();
+
+		void InitializeSubSystemServers();
+		void StartSubSystemServers();
+		void StopSubSystemServers();
+		void Exit(int Reason);
+		bool SetSubsystemLogLevel(const std::string & SubSystem, const std::string & Level);
+		[[nodiscard]] std::string Version() { return Version_; }
+		[[nodiscard]] const Poco::SharedPtr<Poco::Crypto::RSAKey> & Key() { return AppKey_; }
+		[[nodiscard]] inline const std::string & DataDir() { return DataDir_; }
+		[[nodiscard]] std::string CreateUUID();
+		[[nodiscard]] bool Debug() const { return DebugMode_; }
+		[[nodiscard]] uint64_t ID() const { return ID_; }
+		[[nodiscard]] Types::StringVec GetSubSystems() const;
+		[[nodiscard]] Types::StringPairVec GetLogLevels() ;
+		[[nodiscard]] static const Types::StringVec & GetLogLevelNames();
+		[[nodiscard]] std::string ConfigGetString(const std::string &Key,const std::string & Default);
+		[[nodiscard]] std::string ConfigGetString(const std::string &Key);
+		[[nodiscard]] std::string ConfigPath(const std::string &Key,const std::string & Default);
+		[[nodiscard]] std::string ConfigPath(const std::string &Key);
+		[[nodiscard]] uint64_t ConfigGetInt(const std::string &Key,uint64_t Default);
+		[[nodiscard]] uint64_t ConfigGetInt(const std::string &Key);
+		[[nodiscard]] uint64_t ConfigGetBool(const std::string &Key,bool Default);
+		[[nodiscard]] uint64_t ConfigGetBool(const std::string &Key);
+		[[nodiscard]] std::string Encrypt(const std::string &S);
+		[[nodiscard]] std::string Decrypt(const std::string &S);
+		[[nodiscard]] std::string CreateHash(const std::string &S);
+		[[nodiscard]] std::string Hash() const { return MyHash_; };
+		[[nodiscard]] std::string ServiceType() const { return DAEMON_APP_NAME; };
+		[[nodiscard]] std::string PrivateEndPoint() const { return MyPrivateEndPoint_; };
+		[[nodiscard]] std::string PublicEndPoint() const { return MyPublicEndPoint_; };
+		[[nodiscard]] std::string MakeSystemEventMessage( const std::string & Type ) const ;
+		[[nodiscard]] const Types::SubSystemVec & GetFullSubSystems() { return SubSystems_; }
+		inline uint64_t DaemonBusTimer() const { return DAEMON_BUS_TIMER; };
+
+		void BusMessageReceived( const std::string & Key, const std::string & Message);
+		[[nodiscard]] MicroServiceMetaVec GetServices(const std::string & type);
+		[[nodiscard]] MicroServiceMetaVec GetServices();
+		[[nodiscard]] bool IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request);
+
+		static void SavePID();
+		static inline uint64_t GetPID() { return Poco::Process::id(); };
+		[[nodiscard]] inline const std::string GetPublicAPIEndPoint() { return MyPublicEndPoint_ + "/api/v1"; };
+		[[nodiscard]] inline const std::string & GetUIURI() const { return UIURI_;};
+
+		void Reload(const std::string &Name);   //  reload a subsystem
+		void Reload();                          //  reload the daemon itself
+		void LoadMyConfig();
+
+		void LoadConfigurationFile();
+
+	  private:
+		bool                        HelpRequested_ = false;
+		std::string                 LogDir_;
+		std::string                 ConfigFileName_;
+		Poco::UUIDGenerator         UUIDGenerator_;
+		uint64_t                    ID_ = 1;
+		Poco::SharedPtr<Poco::Crypto::RSAKey>	AppKey_ = nullptr;
+		bool                        DebugMode_ = false;
+		std::string 				DataDir_;
+		Types::SubSystemVec			SubSystems_;
+		Poco::Crypto::CipherFactory & CipherFactory_ = Poco::Crypto::CipherFactory::defaultFactory();
+		Poco::Crypto::Cipher        * Cipher_ = nullptr;
+		Poco::SHA2Engine			SHA2_;
+		MicroServiceMetaMap			Services_;
+		std::string 				MyHash_;
+		std::string 				MyPrivateEndPoint_;
+		std::string 				MyPublicEndPoint_;
+		std::string                 UIURI_;
+		std::string 				Version_{std::string(APP_VERSION) + "("+ BUILD_NUMBER + ")"};
+		BusEventManager				BusEventManager_;
+		std::mutex 					InfraMutex_;
+
+		std::string DAEMON_PROPERTIES_FILENAME;
+		std::string DAEMON_ROOT_ENV_VAR;
+		std::string DAEMON_CONFIG_ENV_VAR;
+		std::string DAEMON_APP_NAME;
+		uint64_t 	DAEMON_BUS_TIMER;
+	};
+}
+
+#endif // UCENTRALGW_MICROSERVICE_H

src/OpenAPIRequest.cpp

@@ -0,0 +1,71 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+//
+
+#include <iostream>
+
+#include "OpenAPIRequest.h"
+
+#include "Poco/Net/HTTPSClientSession.h"
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Net/HTTPResponse.h>
+#include <Poco/JSON/Parser.h>
+#include <Poco/URI.h>
+#include <Poco/Exception.h>
+#include "Utils.h"
+#include "Daemon.h"
+
+namespace OpenWifi {
+
+	OpenAPIRequestGet::OpenAPIRequestGet( 	std::string ServiceType,
+											std::string EndPoint,
+									 		Types::StringPairVec & QueryData,
+											uint64_t msTimeout):
+ 		Type_(std::move(ServiceType)),
+ 		EndPoint_(std::move(EndPoint)),
+		QueryData_(QueryData),
+		msTimeout_(msTimeout) {
+
+	}
+
+	int OpenAPIRequestGet::Do(Poco::JSON::Object::Ptr &ResponseObject) {
+		try {
+		    auto Services = Daemon()->GetServices(Type_);
+			for(auto const &Svc:Services) {
+				Poco::URI	URI(Svc.PrivateEndPoint);
+				Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
+
+				URI.setPath(EndPoint_);
+				for (const auto &qp : QueryData_)
+					URI.addQueryParameter(qp.first, qp.second);
+
+				std::string Path(URI.getPathAndQuery());
+				Session.setTimeout(Poco::Timespan(msTimeout_/1000, msTimeout_ % 1000));
+
+				Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_GET,
+											   Path,
+											   Poco::Net::HTTPMessage::HTTP_1_1);
+				Request.add("X-API-KEY", Svc.AccessKey);
+				Session.sendRequest(Request);
+
+				Poco::Net::HTTPResponse Response;
+				std::istream &is = Session.receiveResponse(Response);
+				if(Response.getStatus()==Poco::Net::HTTPResponse::HTTP_OK) {
+					Poco::JSON::Parser	P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+				}
+				return Response.getStatus();
+			}
+		}
+		catch (const Poco::Exception &E)
+		{
+			std::cerr << E.displayText() << std::endl;
+		}
+		return -1;
+	}
+}

src/OpenAPIRequest.h

@@ -0,0 +1,33 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_OPENAPIREQUEST_H
+#define UCENTRALGW_OPENAPIREQUEST_H
+
+#include "Poco/JSON/Object.h"
+
+#include "OpenWifiTypes.h"
+
+namespace OpenWifi {
+
+	class OpenAPIRequestGet {
+	  public:
+		explicit OpenAPIRequestGet( std::string Type,
+								   	std::string EndPoint,
+									Types::StringPairVec & QueryData,
+									uint64_t msTimeout);
+		int Do(Poco::JSON::Object::Ptr &ResponseObject);
+	  private:
+		std::string 			Type_;
+		std::string 			EndPoint_;
+		Types::StringPairVec 	QueryData_;
+		uint64_t 				msTimeout_;
+	};
+}
+
+#endif // UCENTRALGW_OPENAPIREQUEST_H

src/OpenWifiTypes.h

@@ -0,0 +1,106 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_UCENTRALTYPES_H
+#define UCENTRALGW_UCENTRALTYPES_H
+
+#include "SubSystemServer.h"
+
+#include <vector>
+#include <string>
+#include <map>
+#include <functional>
+#include <list>
+#include <utility>
+#include <queue>
+
+#include "Poco/StringTokenizer.h"
+#include "Poco/JSON/Parser.h"
+#include "Poco/JSON/Stringifier.h"
+
+namespace OpenWifi::Types {
+    typedef std::pair<std::string,std::string>              StringPair;
+	typedef std::vector<StringPair>	                        StringPairVec;
+    typedef std::queue<StringPair>	                        StringPairQueue;
+	typedef std::vector<std::string>						StringVec;
+	typedef std::set<std::string>                           StringSet;
+	typedef std::vector<SubSystemServer*>					SubSystemVec;
+	typedef std::map<std::string,std::set<std::string>>		StringMapStringSet;
+	typedef std::function<void(std::string, std::string)>   TopicNotifyFunction;
+	typedef std::list<std::pair<TopicNotifyFunction,int>>   TopicNotifyFunctionList;
+	typedef std::map<std::string, TopicNotifyFunctionList>  NotifyTable;
+    typedef std::map<std::string,uint64_t>                  CountedMap;
+
+    typedef std::string         UUID_t;
+    typedef std::vector<UUID_t> UUIDvec_t;
+
+    inline void UpdateCountedMap(CountedMap &M, const std::string &S, uint64_t Increment=1) {
+        auto it = M.find(S);
+        if(it==M.end())
+            M[S] = Increment;
+        else
+            it->second += Increment;
+    }
+
+    inline std::string to_string( const StringVec &V) {
+        Poco::JSON::Array   O;
+        for(const auto &i:V) {
+            O.add(i);
+        }
+        std::stringstream SS;
+        Poco::JSON::Stringifier::stringify(O,SS);
+        return SS.str();
+    }
+
+    inline std::string to_string( const StringPairVec &V) {
+        Poco::JSON::Array   O;
+        for(const auto &i:V) {
+            Poco::JSON::Array OO;
+            OO.add(i.first);
+            OO.add(i.second);
+            O.add(OO);
+        }
+
+        std::stringstream SS;
+        Poco::JSON::Stringifier::stringify(O,SS);
+        return SS.str();
+    }
+
+    inline void from_string(const std::string &S, StringPairVec &V) {
+        try {
+            Poco::JSON::Parser      P;
+            auto O = P.parse(S).extract<Poco::JSON::Array::Ptr>();
+
+            for(const auto &i:*O) {
+                auto Inner = i.extract<Poco::JSON::Array::Ptr>();
+                for(const auto &j:*Inner) {
+                    auto S1 = i[0].toString();
+                    auto S2 = i[1].toString();
+                    V.push_back(std::make_pair(S1,S2));
+                }
+            }
+        } catch (...) {
+
+        }
+    }
+
+    inline void from_string(const std::string &S, StringVec &V) {
+        try {
+            Poco::JSON::Parser      P;
+            auto O = P.parse(S).extract<Poco::JSON::Array::Ptr>();
+
+            for(auto const &i:*O) {
+                V.push_back(i.toString());
+            }
+        } catch (...) {
+
+        }
+    }
+};
+
+#endif // UCENTRALGW_UCENTRALTYPES_H

src/RESTAPI/RESTAPI_action_links.cpp

@@ -1,289 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-22.
-//
-
-#include "Poco/JSON/Parser.h"
-#include "Poco/Net/HTMLForm.h"
-
-#include "RESTAPI_action_links.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_PartHandler.h"
-#include "framework/OpenAPIRequests.h"
-
-#include "Daemon.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_action_links::DoGet() {
-
-        auto Action = GetParameter("action","");
-        auto Id = GetParameter("id","");
-
-        SecurityObjects::ActionLink Link;
-        if(!StorageService()->ActionLinksDB().GetActionLink(Id,Link))
-            return DoReturnA404();
-
-        if(Action=="password_reset")
-            return RequestResetPassword(Link);
-        else if(Action=="sub_password_reset")
-            return RequestSubResetPassword(Link);
-        else if(Action=="email_verification")
-            return DoEmailVerification(Link);
-        else if(Action=="sub_email_verification")
-            return DoSubEmailVerification(Link);
-        else if(Action=="signup_verification")
-            return DoNewSubVerification(Link);
-        else
-            return DoReturnA404();
-    }
-
-    void RESTAPI_action_links::DoPost() {
-        auto Action = GetParameter("action","");
-
-        if(Action=="password_reset")
-            return CompleteResetPassword();
-        else if(Action=="sub_password_reset")
-            return CompleteResetPassword();
-        else if(Action=="signup_completion")
-            return CompleteSubVerification();
-        else if(Action=="email_invitation")
-            return CompleteEmailInvitation();
-        else
-            return DoReturnA404();
-    }
-
-    void RESTAPI_action_links::RequestResetPassword(SecurityObjects::ActionLink &Link) {
-        Logger_.information(fmt::format("REQUEST-PASSWORD-RESET({}): For ID={}", Request->clientAddress().toString(), Link.userId));
-        Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset.html"};
-        Types::StringPairVec    FormVars{ {"UUID", Link.id},
-                                          {"PASSWORD_VALIDATION", AuthService()->PasswordValidationExpression()}};
-        SendHTMLFileBack(FormFile,FormVars);
-    }
-
-    void RESTAPI_action_links::DoNewSubVerification(SecurityObjects::ActionLink &Link) {
-        Logger_.information(fmt::format("REQUEST-SUB-SIGNUP({}): For ID={}", Request->clientAddress().toString(), Link.userId));
-        Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification.html"};
-        Types::StringPairVec    FormVars{ {"UUID", Link.id},
-                                          {"PASSWORD_VALIDATION", AuthService()->PasswordValidationExpression()}};
-        SendHTMLFileBack(FormFile,FormVars);
-    }
-
-    void RESTAPI_action_links::CompleteResetPassword() {
-        //  form has been posted...
-        RESTAPI_PartHandler PartHandler;
-        Poco::Net::HTMLForm Form(*Request, Request->stream(), PartHandler);
-        if (!Form.empty()) {
-
-            auto Password1 = Form.get("password1","bla");
-            auto Password2 = Form.get("password2","blu");
-            auto Id = Form.get("id","");
-            auto now = OpenWifi::Now();
-
-            SecurityObjects::ActionLink Link;
-            if(!StorageService()->ActionLinksDB().GetActionLink(Id,Link))
-                return DoReturnA404();
-
-            if(now > Link.expires) {
-                StorageService()->ActionLinksDB().CancelAction(Id);
-                return DoReturnA404();
-            }
-
-            if(Password1!=Password2 || !AuthService()->ValidatePassword(Password2) || !AuthService()->ValidatePassword(Password1)) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "For some reason, the passwords entered do not match or they do not comply with"
-                                                                 " accepted password creation restrictions. Please consult our on-line help"
-                                                                 " to look at the our password policy. If you would like to contact us, please mention"
-                                                                 " id(" + Id + ")"}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            SecurityObjects::UserInfo   UInfo;
-
-            bool Found = Link.userAction ? StorageService()->UserDB().GetUserById(Link.userId,UInfo) : StorageService()->SubDB().GetUserById(Link.userId,UInfo);
-            if(!Found) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "This request does not contain a valid user ID. Please contact your system administrator."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            if(UInfo.blackListed || UInfo.suspended) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "Please contact our system administrators. We have identified an error in your account that must be resolved first."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            bool GoodPassword = Link.userAction ? AuthService()->SetPassword(Password1,UInfo) : AuthService()->SetSubPassword(Password1,UInfo);
-            if(!GoodPassword) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "You cannot reuse one of your recent passwords."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            UInfo.modified = OpenWifi::Now();
-            if(Link.userAction)
-                StorageService()->UserDB().UpdateUserInfo(UInfo.email,Link.userId,UInfo);
-            else
-                StorageService()->SubDB().UpdateUserInfo(UInfo.email,Link.userId,UInfo);
-
-            Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_success.html"};
-            Types::StringPairVec    FormVars{ {"UUID", Id},
-                                              {"USERNAME", UInfo.email},
-                                              {"ACTION_LINK",MicroService::instance().GetUIURI()}};
-            StorageService()->ActionLinksDB().CompleteAction(Id);
-            SendHTMLFileBack(FormFile,FormVars);
-        } else {
-            DoReturnA404();
-        }
-    }
-
-    void RESTAPI_action_links::CompleteSubVerification() {
-        RESTAPI_PartHandler PartHandler;
-        Poco::Net::HTMLForm Form(*Request, Request->stream(), PartHandler);
-
-        if (!Form.empty()) {
-            auto Password1 = Form.get("password1","bla");
-            auto Password2 = Form.get("password2","blu");
-            auto Id = Form.get("id","");
-            auto now = OpenWifi::Now();
-
-            SecurityObjects::ActionLink Link;
-            if(!StorageService()->ActionLinksDB().GetActionLink(Id,Link)) {
-                return DoReturnA404();
-            }
-
-            if(now > Link.expires) {
-                StorageService()->ActionLinksDB().CancelAction(Id);
-                return DoReturnA404();
-            }
-
-            if(Password1!=Password2 || !AuthService()->ValidateSubPassword(Password1)) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "For some reason, the passwords entered do not match or they do not comply with"
-                                                                 " accepted password creation restrictions. Please consult our on-line help"
-                                                                 " to look at the our password policy. If you would like to contact us, please mention"
-                                                                 " id(" + Id + ")"}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            SecurityObjects::UserInfo   UInfo;
-            bool Found = StorageService()->SubDB().GetUserById(Link.userId,UInfo);
-            if(!Found) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "This request does not contain a valid user ID. Please contact your system administrator."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            if(UInfo.blackListed || UInfo.suspended) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "Please contact our system administrators. We have identified an error in your account that must be resolved first."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            bool GoodPassword = AuthService()->SetSubPassword(Password1,UInfo);
-            if(!GoodPassword) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "You cannot reuse one of your recent passwords."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            UInfo.modified = OpenWifi::Now();
-            UInfo.changePassword = false;
-            UInfo.lastEmailCheck = OpenWifi::Now();
-            UInfo.waitingForEmailCheck = false;
-            UInfo.validated = OpenWifi::Now();
-
-            StorageService()->SubDB().UpdateUserInfo(UInfo.email,Link.userId,UInfo);
-
-            Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_success.html"};
-            Types::StringPairVec    FormVars{ {"UUID", Id},
-                                              {"USERNAME", UInfo.email} };
-            StorageService()->ActionLinksDB().CompleteAction(Id);
-
-            //  Send the update to the provisioning service
-            Poco::JSON::Object  Body;
-            auto RawSignup = Poco::StringTokenizer(UInfo.signingUp,":");
-            Body.set("signupUUID", RawSignup.count()==1 ? UInfo.signingUp : RawSignup[1]);
-            OpenAPIRequestPut   ProvRequest(uSERVICE_PROVISIONING,"/api/v1/signup",
-                                            {
-                                                {"signupUUID", RawSignup.count()==1 ? UInfo.signingUp : RawSignup[1]} ,
-                                                {"operation", "emailVerified"}
-                                            },
-                                            Body,30000);
-            Logger().information(fmt::format("({}): Completed subscriber e-mail verification and password.",UInfo.email));
-            Poco::JSON::Object::Ptr Response;
-            auto Status = ProvRequest.Do(Response);
-            std::stringstream ooo;
-            if(Response!= nullptr)
-                Response->stringify(ooo);
-            Logger().information(fmt::format("({}): Completed subscriber e-mail verification. Provisioning notified, Error={}.",
-                                             UInfo.email, Status));
-            SendHTMLFileBack(FormFile,FormVars);
-            Logger().information(fmt::format("({}): Completed subscriber e-mail verification. FORM notified.",UInfo.email));
-        } else {
-            DoReturnA404();
-        }
-    }
-
-    void RESTAPI_action_links::DoEmailVerification(SecurityObjects::ActionLink &Link) {
-        auto now = OpenWifi::Now();
-
-        if(now > Link.expires) {
-            StorageService()->ActionLinksDB().CancelAction(Link.id);
-            return DoReturnA404();
-        }
-
-        SecurityObjects::UserInfo UInfo;
-        bool Found = Link.userAction ? StorageService()->UserDB().GetUserById(Link.userId,UInfo) : StorageService()->SubDB().GetUserById(Link.userId,UInfo);
-        if (!Found) {
-            Types::StringPairVec FormVars{{"UUID",       Link.id},
-                                          {"ERROR_TEXT", "This does not appear to be a valid email verification link.."}};
-            Poco::File FormFile{Daemon()->AssetDir() + "/email_verification_error.html"};
-            return SendHTMLFileBack(FormFile, FormVars);
-        }
-
-        Logger_.information(fmt::format("EMAIL-VERIFICATION(%s): For ID={}", Request->clientAddress().toString(),
-                                        UInfo.email));
-        UInfo.waitingForEmailCheck = false;
-        UInfo.validated = true;
-        UInfo.lastEmailCheck = OpenWifi::Now();
-        UInfo.validationDate = OpenWifi::Now();
-        UInfo.modified  = OpenWifi::Now();
-        if(Link.userAction)
-            StorageService()->UserDB().UpdateUserInfo(UInfo.email, Link.userId, UInfo);
-        else
-            StorageService()->SubDB().UpdateUserInfo(UInfo.email, Link.userId, UInfo);
-        Types::StringPairVec FormVars{{"UUID",     Link.id},
-                                      {"USERNAME", UInfo.email},
-                                      {"ACTION_LINK",MicroService::instance().GetUIURI()}};
-        Poco::File FormFile{Daemon()->AssetDir() + "/email_verification_success.html"};
-        StorageService()->ActionLinksDB().CompleteAction(Link.id);
-        SendHTMLFileBack(FormFile, FormVars);
-    }
-
-    void RESTAPI_action_links::DoReturnA404() {
-        Types::StringPairVec FormVars;
-        Poco::File FormFile{Daemon()->AssetDir() + "/404_error.html"};
-        SendHTMLFileBack(FormFile, FormVars);
-    }
-
-    void RESTAPI_action_links::CompleteEmailInvitation() {
-        /// TODO:
-    }
-
-    void RESTAPI_action_links::RequestSubResetPassword([[maybe_unused]] SecurityObjects::ActionLink &Link) {
-
-    }
-
-    void RESTAPI_action_links::DoSubEmailVerification([[maybe_unused]] SecurityObjects::ActionLink &Link) {
-
-    }
-
-}

src/RESTAPI/RESTAPI_action_links.h

@@ -1,39 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-22.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_action_links : public RESTAPIHandler {
-    public:
-        RESTAPI_action_links(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-             std::vector<std::string>{
-                                        Poco::Net::HTTPRequest::HTTP_GET,
-                                        Poco::Net::HTTPRequest::HTTP_POST,
-                                        Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                        Server,
-                                        TransactionId,
-                                        Internal,
-                                        false,
-                                        true, RateLimit{.Interval=1000,.MaxCalls=10}) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/actionLink"}; };
-        void RequestResetPassword(SecurityObjects::ActionLink &Link);
-        void RequestSubResetPassword(SecurityObjects::ActionLink &Link);
-        void CompleteResetPassword();
-        void CompleteSubVerification();
-        void DoEmailVerification(SecurityObjects::ActionLink &Link);
-        void DoSubEmailVerification(SecurityObjects::ActionLink &Link);
-        void DoReturnA404();
-        void DoNewSubVerification(SecurityObjects::ActionLink &Link);
-        void CompleteEmailInvitation();
-
-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}

src/RESTAPI/RESTAPI_apiKey_handler.cpp

@@ -1,158 +0,0 @@
-//
-// Created by stephane bourque on 2022-11-04.
-//
-
-#include "RESTAPI_apiKey_handler.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_apiKey_handler::DoGet() {
-        std::string     user_uuid = GetBinding("uuid","");
-        if(user_uuid.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        if(user_uuid!=UserInfo_.userinfo.id && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        SecurityObjects::ApiKeyEntryList    List;
-        if(DB_.GetRecords(0,500, List.apiKeys, fmt::format(" userUuid='{}' ", user_uuid))) {
-            for(auto &key:List.apiKeys) {
-                Sanitize(UserInfo_, key);
-            }
-            Poco::JSON::Object  Answer;
-            List.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        return NotFound();
-    }
-
-    void RESTAPI_apiKey_handler::DoDelete() {
-        std::string     user_uuid = GetBinding("uuid","");
-        if(user_uuid.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        if(user_uuid!=UserInfo_.userinfo.id && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(user_uuid!=UserInfo_.userinfo.id) {
-            if(!StorageService()->UserDB().Exists("id",user_uuid)) {
-                return NotFound();
-            }
-        }
-
-        std::string ApiKeyId= GetParameter("keyUuid","");
-        if(ApiKeyId.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        SecurityObjects::ApiKeyEntry    ApiKey;
-        if(StorageService()->ApiKeyDB().GetRecord("id",ApiKeyId,ApiKey)) {
-            if(ApiKey.userUuid==user_uuid) {
-                AuthService()->RemoveTokenSystemWide(ApiKey.apiKey);
-                DB_.DeleteRecord("id", ApiKeyId);
-                return OK();
-            }
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        return NotFound();
-    }
-
-    void RESTAPI_apiKey_handler::DoPost() {
-        std::string     user_uuid = GetBinding("uuid","");
-
-        if(user_uuid.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        if(user_uuid!=UserInfo_.userinfo.id && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(user_uuid!=UserInfo_.userinfo.id) {
-            //  Must verify if the user exists
-            if(!StorageService()->UserDB().Exists("id",user_uuid)) {
-                return BadRequest(RESTAPI::Errors::UserMustExist);
-            }
-        }
-
-        SecurityObjects::ApiKeyEntry    NewKey;
-        if(!NewKey.from_json(ParsedBody_)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-        NewKey.lastUse = 0 ;
-
-        if(!Utils::IsAlphaNumeric(NewKey.name) || NewKey.name.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        Poco::toLowerInPlace(NewKey.name);
-        NewKey.userUuid = user_uuid;
-        if(NewKey.expiresOn < Utils::Now()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        //  does a key of that name already exit for this user?
-        SecurityObjects::ApiKeyEntryList    ExistingList;
-        if(DB_.GetRecords(0,500, ExistingList.apiKeys, fmt::format(" userUuid='{}' ", user_uuid))) {
-            if(std::find_if(ExistingList.apiKeys.begin(),ExistingList.apiKeys.end(), [NewKey](const SecurityObjects::ApiKeyEntry &E) -> bool {
-                return E.name==NewKey.name;
-            })!=ExistingList.apiKeys.end()) {
-                return BadRequest(RESTAPI::Errors::ApiKeyNameAlreadyExists);
-            }
-        }
-
-        if(ExistingList.apiKeys.size()>=10) {
-            return BadRequest(RESTAPI::Errors::TooManyApiKeys);
-        }
-
-        NewKey.id = MicroServiceCreateUUID();
-        NewKey.userUuid = user_uuid;
-        NewKey.salt = std::to_string(Utils::Now());
-        NewKey.apiKey = Utils::ComputeHash(NewKey.salt, UserInfo_.userinfo.id, UserInfo_.webtoken.access_token_ );
-        NewKey.created = Utils::Now();
-
-        if(DB_.CreateRecord(NewKey)) {
-            Poco::JSON::Object  Answer;
-            NewKey.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        return BadRequest(RESTAPI::Errors::RecordNotCreated);
-    }
-
-    void RESTAPI_apiKey_handler::DoPut() {
-        std::string     user_uuid = GetBinding("uuid","");
-        if(user_uuid.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        if(user_uuid!=UserInfo_.userinfo.id && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-        SecurityObjects::ApiKeyEntry    NewKey;
-        if(!NewKey.from_json(ParsedBody_)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        SecurityObjects::ApiKeyEntry    ExistingKey;
-        if(!DB_.GetRecord("id",NewKey.id,ExistingKey)) {
-            return BadRequest(RESTAPI::Errors::ApiKeyDoesNotExist);
-        }
-
-        if(ExistingKey.userUuid!=user_uuid) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        AssignIfPresent(ParsedBody_,"description",ExistingKey.description);
-
-        if(DB_.UpdateRecord("id",ExistingKey.id,ExistingKey)) {
-            Poco::JSON::Object  Answer;
-            ExistingKey.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        BadRequest(RESTAPI::Errors::RecordNotUpdated);
-    }
-
-}

src/RESTAPI/RESTAPI_apiKey_handler.h

@@ -1,34 +0,0 @@
-//
-// Created by stephane bourque on 2022-11-04.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-#include "StorageService.h"
-namespace OpenWifi {
-    class RESTAPI_apiKey_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_apiKey_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>{
-                                         Poco::Net::HTTPRequest::HTTP_GET,
-                                         Poco::Net::HTTPRequest::HTTP_PUT,
-                                         Poco::Net::HTTPRequest::HTTP_POST,
-                                         Poco::Net::HTTPRequest::HTTP_DELETE,
-                                         Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                 Server,
-                                 TransactionId,
-                                 Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/apiKey/{uuid}"}; };
-    private:
-        ApiKeyDB     &DB_=StorageService()->ApiKeyDB();
-
-        void DoGet() final;
-        void DoPut() final;
-        void DoPost() final;
-        void DoDelete() final;
-
-    };
-}
-

src/RESTAPI/RESTAPI_avatar_handler.cpp

@@ -1,83 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-15.
-//
-
-#include <fstream>
-#include <iostream>
-
-#include "RESTAPI_avatar_handler.h"
-#include "StorageService.h"
-#include "Poco/Net/HTMLForm.h"
-#include "Poco/CountingStream.h"
-#include "framework/MicroServiceFuncs.h"
-
-namespace OpenWifi {
-
-    void AvatarPartHandler::handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream) {
-        FileType_ = Header.get(RESTAPI::Protocol::CONTENTTYPE, RESTAPI::Protocol::UNSPECIFIED);
-        if (Header.has(RESTAPI::Protocol::CONTENTDISPOSITION)) {
-            std::string Disposition;
-            Poco::Net::NameValueCollection Parameters;
-            Poco::Net::MessageHeader::splitParameters(Header[RESTAPI::Protocol::CONTENTDISPOSITION], Disposition, Parameters);
-            Name_ = Parameters.get(RESTAPI::Protocol::NAME, RESTAPI::Protocol::UNNAMED);
-        }
-        Poco::CountingInputStream InputStream(Stream);
-        Poco::StreamCopier::copyStream(InputStream, OutputStream_);
-        Length_ = OutputStream_.str().size();
-    };
-
-    void RESTAPI_avatar_handler::DoPost() {
-        std::string Id = UserInfo_.userinfo.id;
-        SecurityObjects::UserInfo UInfo;
-
-        std::stringstream SS;
-        AvatarPartHandler partHandler(Id, Logger_, SS);
-        Poco::Net::HTMLForm form(*Request, Request->stream(), partHandler);
-        Poco::JSON::Object Answer;
-
-        if (!partHandler.Name().empty() && partHandler.Length()< MicroServiceConfigGetInt("openwifi.avatar.maxsize",2000000)) {
-            Answer.set(RESTAPI::Protocol::AVATARID, Id);
-            Answer.set(RESTAPI::Protocol::ERRORCODE, 0);
-            Logger_.information(fmt::format("Uploaded avatar: {} Type: {}", partHandler.Name(), partHandler.ContentType()));
-            StorageService()->AvatarDB().SetAvatar(UserInfo_.userinfo.email,
-                                 Id, SS.str(), partHandler.ContentType(), partHandler.Name());
-            StorageService()->UserDB().SetAvatar(Id,"1");
-            Logger().information(fmt::format("Adding avatar for {}",UserInfo_.userinfo.email));
-        } else {
-            Answer.set(RESTAPI::Protocol::AVATARID, Id);
-            Answer.set(RESTAPI::Protocol::ERRORCODE, 13);
-            Answer.set(RESTAPI::Protocol::ERRORTEXT, "Avatar upload could not complete.");
-        }
-        ReturnObject(Answer);
-    }
-
-    void RESTAPI_avatar_handler::DoGet() {
-        std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
-        if (Id.empty()) {
-            return NotFound();
-        }
-
-        std::string Type, Name, AvatarContent;
-        if (!StorageService()->AvatarDB().GetAvatar(UserInfo_.userinfo.email, Id, AvatarContent, Type, Name)) {
-            return NotFound();
-        }
-        Logger().information(fmt::format("Retrieving avatar for {}, size:{}",UserInfo_.userinfo.email,AvatarContent.size()));
-        return SendFileContent(AvatarContent, Type, Name);
-    }
-
-    void RESTAPI_avatar_handler::DoDelete() {
-        std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
-
-        if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && Id!=UserInfo_.userinfo.id) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if (!StorageService()->AvatarDB().DeleteAvatar(UserInfo_.userinfo.email, Id)) {
-            return NotFound();
-        }
-
-        Logger().information(fmt::format("Deleted avatar for {}",UserInfo_.userinfo.email));
-        StorageService()->UserDB().SetAvatar(Id,"");
-        OK();
-    }
-}

src/RESTAPI/RESTAPI_db_helpers.h

@@ -1,20 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-01.
-//
-
-#pragma once
-
-#include "framework/orm.h"
-
-namespace OpenWifi {
-
-    inline void Sanitize([[maybe_unused]] const SecurityObjects::UserInfoAndPolicy &User, SecurityObjects::UserInfo & U) {
-        U.currentPassword.clear();
-        U.lastPasswords.clear();
-        U.oauthType.clear();
-    }
-
-    inline void Sanitize([[maybe_unused]] const SecurityObjects::UserInfoAndPolicy &User, SecurityObjects::ApiKeyEntry & U) {
-        U.salt.clear();
-    }
-}

src/RESTAPI/RESTAPI_email_handler.cpp

@@ -1,34 +0,0 @@
-//
-// Created by stephane bourque on 2021-09-02.
-//
-
-#include "RESTAPI_email_handler.h"
-#include "Poco/JSON/Parser.h"
-
-#include "SMTPMailerService.h"
-#include "framework/ow_constants.h"
-
-namespace OpenWifi {
-    void RESTAPI_email_handler::DoPost() {
-        const auto & Obj = ParsedBody_;
-        if (Obj->has("subject") &&
-            Obj->has("from") &&
-            Obj->has("text") &&
-            Obj->has("recipients") &&
-            Obj->isArray("recipients")) {
-
-            Poco::JSON::Array::Ptr Recipients = Obj->getArray("recipients");
-            auto Recipient = Recipients->get(0).toString();
-            MessageAttributes Attrs;
-            Attrs[RECIPIENT_EMAIL] = Recipient;
-            Attrs[SUBJECT] = Obj->get("subject").toString();
-            Attrs[TEXT] = Obj->get("text").toString();
-            Attrs[SENDER] = Obj->get("from").toString();
-            if(SMTPMailerService()->SendMessage(Recipient, "password_reset.txt", Attrs, false)) {
-                return OK();
-            }
-            return ReturnStatus(Poco::Net::HTTPResponse::HTTP_SERVICE_UNAVAILABLE);
-        }
-        BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-    }
-}

src/RESTAPI/RESTAPI_oauth2_handler.cpp

@@ -1,179 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "Poco/JSON/Parser.h"
-
-#include "AuthService.h"
-#include "RESTAPI_oauth2_handler.h"
-#include "MFAServer.h"
-#include "framework/ow_constants.h"
-#include "StorageService.h"
-#include "RESTAPI_db_helpers.h"
-
-#include "framework/MicroServiceFuncs.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_oauth2_handler::DoGet() {
-        bool Expired = false, Contacted = false;
-        if (!IsAuthorized(Expired, Contacted)) {
-            if (Expired)
-                return UnAuthorized(RESTAPI::Errors::EXPIRED_TOKEN);
-            return UnAuthorized(RESTAPI::Errors::INVALID_TOKEN);
-        }
-        if (GetBoolParameter(RESTAPI::Protocol::ME)) {
-            Logger_.information(fmt::format("REQUEST-ME({}): Request for {}", Request->clientAddress().toString(),
-                                            UserInfo_.userinfo.email));
-            Poco::JSON::Object Me;
-            SecurityObjects::UserInfo ReturnedUser = UserInfo_.userinfo;
-            Sanitize(UserInfo_, ReturnedUser);
-            ReturnedUser.to_json(Me);
-            return ReturnObject(Me);
-        }
-        BadRequest(RESTAPI::Errors::UnrecognizedRequest);
-    }
-
-    void RESTAPI_oauth2_handler::DoDelete() {
-        auto Token = GetBinding(RESTAPI::Protocol::TOKEN, "");
-        std::string SessionToken;
-        try {
-            Poco::Net::OAuth20Credentials Auth(*Request);
-            if (Auth.getScheme() == "Bearer") {
-                SessionToken = Auth.getBearerToken();
-            }
-        } catch (const Poco::Exception &E) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        if (Token.empty() || (Token != SessionToken)) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        AuthService()->Logout(Token);
-        return ReturnStatus(Poco::Net::HTTPResponse::HTTP_NO_CONTENT, true);
-    }
-
-	void RESTAPI_oauth2_handler::DoPost() {
-
-        const auto & Obj = ParsedBody_;
-        if(Obj == nullptr) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        auto userId = GetS(RESTAPI::Protocol::USERID, Obj);
-        auto password = GetS(RESTAPI::Protocol::PASSWORD, Obj);
-        auto newPassword = GetS(RESTAPI::Protocol::NEWPASSWORD, Obj);
-        auto refreshToken = GetS("refreshToken", Obj);
-        auto grant_type = GetParameter("grant_type");
-
-        Poco::toLowerInPlace(userId);
-
-        if(!refreshToken.empty() && grant_type == "refresh_token") {
-            SecurityObjects::UserInfoAndPolicy UInfo;
-            if(AuthService()->RefreshUserToken(*Request, refreshToken, UInfo)) {
-                Poco::JSON::Object  Answer;
-                UInfo.webtoken.to_json(Answer);
-                return ReturnObject(Answer);
-            } else {
-                return UnAuthorized(RESTAPI::Errors::CANNOT_REFRESH_TOKEN);
-            }
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::REQUIREMENTS)) {
-            Logger_.information(fmt::format("POLICY-REQUEST({}): Request.", Request->clientAddress().toString()));
-            Poco::JSON::Object  Answer;
-            Answer.set(RESTAPI::Protocol::PASSWORDPATTERN, AuthService()->PasswordValidationExpression());
-            Answer.set(RESTAPI::Protocol::ACCESSPOLICY, AuthService()->GetAccessPolicy());
-            Answer.set(RESTAPI::Protocol::PASSWORDPOLICY, AuthService()->GetPasswordPolicy());
-            return ReturnObject(Answer);
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD)) {
-            SecurityObjects::UserInfo UInfo1;
-            auto UserExists = StorageService()->UserDB().GetUserByEmail(userId,UInfo1);
-            if(UserExists) {
-                Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}", Request->clientAddress().toString(), userId));
-                SecurityObjects::ActionLink NewLink;
-
-                NewLink.action = OpenWifi::SecurityObjects::LinkActions::FORGOT_PASSWORD;
-                NewLink.id = MicroServiceCreateUUID();
-                NewLink.userId = UInfo1.id;
-                NewLink.created = OpenWifi::Now();
-                NewLink.expires = NewLink.created + (24*60*60);
-                NewLink.userAction = true;
-                StorageService()->ActionLinksDB().CreateAction(NewLink);
-
-                Poco::JSON::Object ReturnObj;
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                UInfo.webtoken.userMustChangePassword = true;
-                UInfo.webtoken.to_json(ReturnObj);
-                return ReturnObject(ReturnObj);
-            } else {
-                Poco::JSON::Object ReturnObj;
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                UInfo.webtoken.userMustChangePassword = true;
-                UInfo.webtoken.to_json(ReturnObj);
-                return ReturnObject(ReturnObj);
-            }
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::RESENDMFACODE)) {
-            Logger_.information(fmt::format("RESEND-MFA-CODE({}): Request for {}", Request->clientAddress().toString(), userId));
-            if(Obj->has("uuid")) {
-                auto uuid = Obj->get("uuid").toString();
-                if(MFAServer()->ResendCode(uuid))
-                    return OK();
-            }
-            return UnAuthorized(RESTAPI::Errors::BAD_MFA_TRANSACTION);
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::COMPLETEMFACHALLENGE,false)) {
-            Logger_.information(fmt::format("COMPLETE-MFA-CHALLENGE({}): Request for {}", Request->clientAddress().toString(), userId));
-            if(Obj->has("uuid")) {
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                if(MFAServer()->CompleteMFAChallenge(Obj,UInfo)) {
-                    Poco::JSON::Object ReturnObj;
-                    UInfo.webtoken.to_json(ReturnObj);
-                    return ReturnObject(ReturnObj);
-                }
-            }
-            return UnAuthorized(RESTAPI::Errors::MFA_FAILURE);
-        }
-
-        SecurityObjects::UserInfoAndPolicy UInfo;
-        bool Expired=false;
-        auto Code=AuthService()->Authorize(userId, password, newPassword, UInfo, Expired);
-        if (Code==SUCCESS) {
-            Poco::JSON::Object ReturnObj;
-            if(AuthService()->RequiresMFA(UInfo)) {
-                if(MFAServer()->StartMFAChallenge(UInfo, ReturnObj)) {
-                    return ReturnObject(ReturnObj);
-                }
-                Logger_.warning("MFA Seems to be broken. Please fix. Disabling MFA checking for now.");
-            }
-            UInfo.webtoken.to_json(ReturnObj);
-            return ReturnObject(ReturnObj);
-        } else {
-
-            switch(Code) {
-                case INVALID_CREDENTIALS:
-                    return UnAuthorized(RESTAPI::Errors::INVALID_CREDENTIALS);
-                case PASSWORD_INVALID:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_INVALID);
-                case PASSWORD_ALREADY_USED:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_ALREADY_USED);
-                case USERNAME_PENDING_VERIFICATION:
-                    return UnAuthorized(RESTAPI::Errors::USERNAME_PENDING_VERIFICATION);
-                case PASSWORD_CHANGE_REQUIRED:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_CHANGE_REQUIRED);
-                default:
-                    return UnAuthorized(RESTAPI::Errors::INVALID_CREDENTIALS);
-            }
-            return;
-        }
-	}
-}

src/RESTAPI/RESTAPI_preferences.cpp

@@ -1,36 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-16.
-//
-
-#include "RESTAPI_preferences.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_preferences::DoGet() {
-        SecurityObjects::Preferences    P;
-        Poco::JSON::Object  Answer;
-        StorageService()->PreferencesDB().GetPreferences(UserInfo_.userinfo.id, P);
-        P.to_json(Answer);
-        ReturnObject(Answer);
-    }
-
-    void RESTAPI_preferences::DoPut() {
-
-        SecurityObjects::Preferences    P;
-
-        const auto & RawObject = ParsedBody_;
-        if(!P.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        P.id = UserInfo_.userinfo.id;
-        P.modified = OpenWifi::Now();
-        StorageService()->PreferencesDB().SetPreferences(P);
-
-        Poco::JSON::Object  Answer;
-        P.to_json(Answer);
-        ReturnObject(Answer);
-    }
-
-}

src/RESTAPI/RESTAPI_preferences.h

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-16.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_preferences : public RESTAPIHandler {
-    public:
-        RESTAPI_preferences(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{
-            Poco::Net::HTTPRequest::HTTP_GET,
-            Poco::Net::HTTPRequest::HTTP_PUT,
-            Poco::Net::HTTPRequest::HTTP_OPTIONS},
-            Server,
-            TransactionId,
-            Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/preferences"}; };
-        void DoGet() final;
-        void DoPut() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-    };
-}

src/RESTAPI/RESTAPI_routers.cpp

@@ -1,95 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-23.
-//
-
-#include "RESTAPI/RESTAPI_oauth2_handler.h"
-#include "RESTAPI/RESTAPI_user_handler.h"
-#include "RESTAPI/RESTAPI_users_handler.h"
-#include "RESTAPI/RESTAPI_action_links.h"
-#include "RESTAPI/RESTAPI_system_endpoints_handler.h"
-#include "RESTAPI/RESTAPI_asset_server.h"
-#include "RESTAPI/RESTAPI_avatar_handler.h"
-#include "RESTAPI/RESTAPI_subavatar_handler.h"
-#include "RESTAPI/RESTAPI_email_handler.h"
-#include "RESTAPI/RESTAPI_sms_handler.h"
-#include "RESTAPI/RESTAPI_validate_token_handler.h"
-#include "RESTAPI/RESTAPI_preferences.h"
-#include "RESTAPI/RESTAPI_subpreferences.h"
-#include "RESTAPI/RESTAPI_suboauth2_handler.h"
-#include "RESTAPI/RESTAPI_subuser_handler.h"
-#include "RESTAPI/RESTAPI_subusers_handler.h"
-#include "RESTAPI/RESTAPI_validate_sub_token_handler.h"
-#include "RESTAPI/RESTAPI_submfa_handler.h"
-#include "RESTAPI/RESTAPI_totp_handler.h"
-#include "RESTAPI/RESTAPI_subtotp_handler.h"
-#include "RESTAPI/RESTAPI_signup_handler.h"
-#include "RESTAPI/RESTAPI_apiKey_handler.h"
-#include "RESTAPI/RESTAPI_validate_apikey.h"
-
-#include "framework/RESTAPI_SystemCommand.h"
-#include "framework/RESTAPI_WebSocketServer.h"
-
-namespace OpenWifi {
-
-    Poco::Net::HTTPRequestHandler * RESTAPI_ExtRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServerAccounting & S,
-                                                            uint64_t TransactionId) {
-        return RESTAPI_Router<
-            RESTAPI_oauth2_handler,
-            RESTAPI_user_handler,
-            RESTAPI_users_handler,
-            RESTAPI_system_command,
-            RESTAPI_asset_server,
-            RESTAPI_system_endpoints_handler,
-            RESTAPI_action_links,
-            RESTAPI_avatar_handler,
-            RESTAPI_subavatar_handler,
-            RESTAPI_email_handler,
-            RESTAPI_sms_handler,
-            RESTAPI_preferences,
-            RESTAPI_subpreferences,
-            RESTAPI_suboauth2_handler,
-            RESTAPI_subuser_handler,
-            RESTAPI_subusers_handler,
-            RESTAPI_submfa_handler,
-            RESTAPI_totp_handler,
-            RESTAPI_subtotp_handler,
-            RESTAPI_signup_handler,
-            RESTAPI_validate_sub_token_handler,
-            RESTAPI_validate_token_handler,
-            RESTAPI_validate_apikey,
-            RESTAPI_webSocketServer,
-            RESTAPI_apiKey_handler
-        >(Path, Bindings, L, S,TransactionId);
-    }
-
-    Poco::Net::HTTPRequestHandler * RESTAPI_IntRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServerAccounting & S, uint64_t TransactionId) {
-
-        return RESTAPI_Router_I<
-            RESTAPI_oauth2_handler,
-            RESTAPI_user_handler,
-            RESTAPI_users_handler,
-            RESTAPI_system_command,
-            RESTAPI_asset_server,
-            RESTAPI_system_endpoints_handler,
-            RESTAPI_action_links,
-            RESTAPI_avatar_handler,
-            RESTAPI_subavatar_handler,
-            RESTAPI_email_handler,
-            RESTAPI_sms_handler,
-            RESTAPI_preferences,
-            RESTAPI_subpreferences,
-            RESTAPI_suboauth2_handler,
-            RESTAPI_subuser_handler,
-            RESTAPI_subusers_handler,
-            RESTAPI_submfa_handler,
-            RESTAPI_totp_handler,
-            RESTAPI_subtotp_handler,
-            RESTAPI_validate_sub_token_handler,
-            RESTAPI_validate_token_handler,
-            RESTAPI_validate_apikey,
-            RESTAPI_signup_handler
-        >(Path, Bindings, L, S, TransactionId);
-    }
-}

src/RESTAPI/RESTAPI_signup_handler.cpp

@@ -1,75 +0,0 @@
-//
-// Created by stephane bourque on 2022-02-20.
-//
-
-#include "RESTAPI_signup_handler.h"
-#include "StorageService.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/MicroServiceFuncs.h"
-
-#define __DBG__ std::cout << __LINE__ << std::endl;
-namespace OpenWifi {
-
-    void RESTAPI_signup_handler::DoPost() {
-        auto UserName = GetParameter("email");
-        auto signupUUID = GetParameter("signupUUID");
-        auto owner = GetParameter("owner");
-        auto operatorName = GetParameter("operatorName");
-        if(UserName.empty() || signupUUID.empty() || owner.empty() || operatorName.empty()) {
-            Logger().error("Signup requires: email, signupUUID, operatorName, and owner.");
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        if(!Utils::ValidEMailAddress(UserName)) {
-            return BadRequest(RESTAPI::Errors::InvalidEmailAddress);
-        }
-
-        // Do we already exist? Can only signup once...
-        SecurityObjects::UserInfo   Existing;
-        if(StorageService()->SubDB().GetUserByEmail(UserName,Existing)) {
-            if(Existing.signingUp.empty()) {
-                return BadRequest(RESTAPI::Errors::SignupAlreadySigned);
-            }
-
-            if(Existing.waitingForEmailCheck) {
-                return BadRequest(RESTAPI::Errors::SignupEmailCheck);
-            }
-
-            return BadRequest(RESTAPI::Errors::SignupWaitingForDevice);
-        }
-
-        SecurityObjects::UserInfo   NewSub;
-        NewSub.signingUp = operatorName + ":" + signupUUID;
-        NewSub.waitingForEmailCheck = true;
-        NewSub.name = UserName;
-        NewSub.modified = OpenWifi::Now();
-        NewSub.creationDate = OpenWifi::Now();
-        NewSub.id = MicroServiceCreateUUID();
-        NewSub.email = UserName;
-        NewSub.userRole = SecurityObjects::SUBSCRIBER;
-        NewSub.changePassword = true;
-        NewSub.owner = owner;
-
-        StorageService()->SubDB().CreateRecord(NewSub);
-
-        Logger_.information(fmt::format("SIGNUP-PASSWORD({}): Request for {}", Request->clientAddress().toString(), UserName));
-        SecurityObjects::ActionLink NewLink;
-
-        NewLink.action = OpenWifi::SecurityObjects::LinkActions::SUB_SIGNUP;
-        NewLink.id = MicroServiceCreateUUID();
-        NewLink.userId = NewSub.id;
-        NewLink.created = OpenWifi::Now();
-        NewLink.expires = NewLink.created + (1*60*60);  // 1 hour
-        NewLink.userAction = false;
-        StorageService()->ActionLinksDB().CreateAction(NewLink);
-
-        Poco::JSON::Object  Answer;
-        NewSub.to_json(Answer);
-        return ReturnObject(Answer);
-    }
-
-    void RESTAPI_signup_handler::DoPut() {
-        // TODO
-    }
-
-}

src/RESTAPI/RESTAPI_signup_handler.h

@@ -1,39 +0,0 @@
-//
-// Created by stephane bourque on 2022-02-20.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_signup_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_signup_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>{
-                                         Poco::Net::HTTPRequest::HTTP_POST,
-                                         Poco::Net::HTTPRequest::HTTP_OPTIONS,
-                                         Poco::Net::HTTPRequest::HTTP_PUT},
-                                 Server,
-                                 TransactionId,
-                                 Internal, false, true ){}
-
-        static auto PathName() { return std::list<std::string>{"/api/v1/signup"}; };
-
-/*        inline bool RoleIsAuthorized(std::string & Reason) {
-            if(UserInfo_.userinfo.userRole != SecurityObjects::USER_ROLE::SUBSCRIBER) {
-                Reason = "User must be a subscriber";
-                return false;
-            }
-            return true;
-        }
-*/
-        void DoGet() final {};
-        void DoPost() final;
-        void DoPut() final ;
-        void DoDelete() final {};
-    private:
-
-    };
-}

src/RESTAPI/RESTAPI_sms_handler.cpp

@@ -1,58 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-09.
-//
-
-#include "RESTAPI_sms_handler.h"
-#include "SMSSender.h"
-#include "framework/ow_constants.h"
-
-namespace OpenWifi {
-
-    void OpenWifi::RESTAPI_sms_handler::DoPost() {
-        const auto &Obj = ParsedBody_;
-
-        if(!SMSSender()->Enabled()) {
-            return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-        }
-
-        std::string Arg;
-        if(HasParameter("validateNumber",Arg) && Arg=="true" && Obj->has("to")) {
-            auto Number = Obj->get("to").toString();
-            if(SMSSender()->StartValidation(Number, UserInfo_.userinfo.email)) {
-                return OK();
-            }
-            return BadRequest(RESTAPI::Errors::SMSCouldNotBeSentRetry);
-        }
-
-        std::string Code;
-        if( HasParameter("completeValidation",Arg) &&
-            Arg=="true" &&
-            HasParameter("validationCode", Code) &&
-            Obj->has("to")) {
-            auto Number = Obj->get("to").toString();
-            if(SMSSender()->CompleteValidation(Number, Code, UserInfo_.userinfo.email)) {
-                return OK();
-            }
-            return BadRequest(RESTAPI::Errors::SMSCouldNotValidate);
-        }
-
-        if( UserInfo_.userinfo.userRole!=SecurityObjects::ROOT &&
-            UserInfo_.userinfo.userRole!=SecurityObjects::PARTNER &&
-            UserInfo_.userinfo.userRole!=SecurityObjects::ADMIN) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if (Obj->has("to") &&
-            Obj->has("text")) {
-
-            std::string PhoneNumber = Obj->get("to").toString();
-            std::string Text = Obj->get("text").toString();
-            if(SMSSender()->Send(PhoneNumber, Text))
-                return OK();
-
-            return InternalError(RESTAPI::Errors::SMSCouldNotBeSentRetry);
-        }
-        BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-    }
-
-}

src/RESTAPI/RESTAPI_sms_handler.h

@@ -1,25 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-09.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_sms_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_sms_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
-                                                  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                                  Server,
-                                                  TransactionId,
-                                                  Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/sms"};}
-        void DoGet() final {};
-        void DoPost() final;
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}

src/RESTAPI/RESTAPI_subavatar_handler.cpp

@@ -1,82 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-15.
-//
-
-#include <fstream>
-#include <iostream>
-
-#include "RESTAPI_subavatar_handler.h"
-#include "StorageService.h"
-#include "Poco/Net/HTMLForm.h"
-#include "Poco/CountingStream.h"
-#include "framework/MicroServiceFuncs.h"
-
-namespace OpenWifi {
-
-    void SubAvatarPartHandler::handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream) {
-        FileType_ = Header.get(RESTAPI::Protocol::CONTENTTYPE, RESTAPI::Protocol::UNSPECIFIED);
-        if (Header.has(RESTAPI::Protocol::CONTENTDISPOSITION)) {
-            std::string Disposition;
-            Poco::Net::NameValueCollection Parameters;
-            Poco::Net::MessageHeader::splitParameters(Header[RESTAPI::Protocol::CONTENTDISPOSITION], Disposition, Parameters);
-            Name_ = Parameters.get(RESTAPI::Protocol::NAME, RESTAPI::Protocol::UNNAMED);
-        }
-        Poco::CountingInputStream InputStream(Stream);
-        Poco::StreamCopier::copyStream(InputStream, OutputStream_);
-        Length_ = OutputStream_.str().size();
-    };
-
-    void RESTAPI_subavatar_handler::DoPost() {
-        std::string Id = UserInfo_.userinfo.id;
-        SecurityObjects::UserInfo UInfo;
-
-        std::stringstream SS;
-        SubAvatarPartHandler partHandler(Id, Logger_, SS);
-        Poco::Net::HTMLForm form(*Request, Request->stream(), partHandler);
-        Poco::JSON::Object Answer;
-
-        if (!partHandler.Name().empty() && partHandler.Length()< MicroServiceConfigGetInt("openwifi.avatar.maxsize",2000000)) {
-            Answer.set(RESTAPI::Protocol::AVATARID, Id);
-            Answer.set(RESTAPI::Protocol::ERRORCODE, 0);
-            Logger_.information(fmt::format("Uploaded avatar: {} Type: {}", partHandler.Name(), partHandler.ContentType()));
-            StorageService()->SubAvatarDB().SetAvatar(UserInfo_.userinfo.email,
-                                 Id, SS.str(), partHandler.ContentType(), partHandler.Name());
-            StorageService()->SubDB().SetAvatar(Id,"1");
-            Logger().information(fmt::format("Adding avatar for {}",UserInfo_.userinfo.email));
-        } else {
-            Answer.set(RESTAPI::Protocol::AVATARID, Id);
-            Answer.set(RESTAPI::Protocol::ERRORCODE, 13);
-            Answer.set(RESTAPI::Protocol::ERRORTEXT, "Avatar upload could not complete.");
-        }
-        ReturnObject(Answer);
-    }
-
-    void RESTAPI_subavatar_handler::DoGet() {
-        std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
-        if (Id.empty()) {
-            return NotFound();
-        }
-
-        std::string Type, Name, AvatarContent;
-        if (!StorageService()->SubAvatarDB().GetAvatar(UserInfo_.userinfo.email, Id, AvatarContent, Type, Name)) {
-            return NotFound();
-        }
-        Logger().information(fmt::format("Retrieving avatar for {}",UserInfo_.userinfo.email));
-        return SendFileContent(AvatarContent, Type, Name);
-    }
-
-    void RESTAPI_subavatar_handler::DoDelete() {
-        std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
-
-        if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && Id!=UserInfo_.userinfo.id) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if (!StorageService()->SubAvatarDB().DeleteAvatar(UserInfo_.userinfo.email, Id)) {
-            return NotFound();
-        }
-        Logger().information(fmt::format("Deleted avatar for {}",UserInfo_.userinfo.email));
-        StorageService()->SubDB().SetAvatar(Id,"");
-        OK();
-    }
-}

src/RESTAPI/RESTAPI_subavatar_handler.h

@@ -1,54 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-15.
-//
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-#include "Poco/Net/PartHandler.h"
-
-namespace OpenWifi {
-
-    class SubAvatarPartHandler : public Poco::Net::PartHandler {
-    public:
-        SubAvatarPartHandler(std::string Id, Poco::Logger &Logger, std::stringstream & ofs) :
-                Id_(std::move(Id)),
-                Logger_(Logger),
-                OutputStream_(ofs){
-        }
-        void handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream);
-        [[nodiscard]] uint64_t Length() const { return Length_; }
-        [[nodiscard]] std::string &Name() { return Name_; }
-        [[nodiscard]] std::string &ContentType() { return FileType_; }
-
-    private:
-        uint64_t        Length_ = 0;
-        std::string     FileType_;
-        std::string     Name_;
-        std::string     Id_;
-        Poco::Logger    &Logger_;
-        std::stringstream &OutputStream_;
-
-        inline Poco::Logger & Logger() { return Logger_; }
-    };
-
-    class RESTAPI_subavatar_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_subavatar_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>{
-                                         Poco::Net::HTTPRequest::HTTP_GET,
-                                         Poco::Net::HTTPRequest::HTTP_POST,
-                                         Poco::Net::HTTPRequest::HTTP_DELETE,
-                                         Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                         Server,
-                                         TransactionId,
-                                         Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subavatar/{id}"}; };
-
-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final;
-        void DoPut() final {};
-
-    };
-}

src/RESTAPI/RESTAPI_submfa_handler.cpp

@@ -1,138 +0,0 @@
-//
-// Created by stephane bourque on 2021-12-01.
-//
-
-#include "RESTAPI_submfa_handler.h"
-#include "StorageService.h"
-#include "SMSSender.h"
-#include "framework/MicroServiceFuncs.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_submfa_handler::DoGet() {
-        SecurityObjects::UserInfo   User;
-
-        if (StorageService()->SubDB().GetUserById(UserInfo_.userinfo.id,User)) {
-            Poco::JSON::Object              Answer;
-            SecurityObjects::SubMfaConfig   MFC;
-
-            MFC.id = User.id;
-            if(User.userTypeProprietaryInfo.mfa.enabled) {
-                if(User.userTypeProprietaryInfo.mfa.method == "sms") {
-                    MFC.sms = User.userTypeProprietaryInfo.mobiles[0].number;
-                    MFC.type = "sms";
-                } else if(User.userTypeProprietaryInfo.mfa.method == "email") {
-                    MFC.email = User.email;
-                    MFC.type = "email";
-                }
-            } else {
-                MFC.type = "disabled";
-            }
-            MFC.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        NotFound();
-    }
-
-    void RESTAPI_submfa_handler::DoPut() {
-
-        try {
-            const auto & Body = ParsedBody_;
-
-            SecurityObjects::SubMfaConfig MFC;
-
-            if (!MFC.from_json(Body)) {
-                return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-            }
-
-            if (MFC.type == "disabled") {
-                SecurityObjects::UserInfo User;
-                StorageService()->SubDB().GetUserById(UserInfo_.userinfo.id, User);
-                User.userTypeProprietaryInfo.mfa.enabled = false;
-                StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.id, User);
-
-                Poco::JSON::Object Answer;
-                MFC.to_json(Answer);
-                return ReturnObject(Answer);
-            } else if (MFC.type == "email") {
-                SecurityObjects::UserInfo User;
-
-                StorageService()->SubDB().GetUserById(UserInfo_.userinfo.id, User);
-                User.userTypeProprietaryInfo.mfa.enabled = true;
-                User.userTypeProprietaryInfo.mfa.method = "email";
-                StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.id, User);
-
-                MFC.sms = MFC.sms;
-                MFC.type = "email";
-                MFC.email = UserInfo_.userinfo.email;
-                MFC.id = MicroServiceCreateUUID();
-
-                Poco::JSON::Object Answer;
-                MFC.to_json(Answer);
-                return ReturnObject(Answer);
-
-            } else if (MFC.type == "sms") {
-                if (GetBoolParameter("startValidation", false)) {
-                    if (MFC.sms.empty()) {
-                        return BadRequest(RESTAPI::Errors::SMSMissingPhoneNumber);
-                    }
-
-                    if(!SMSSender()->Enabled()) {
-                        return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-                    }
-
-                    if (SMSSender()->StartValidation(MFC.sms, UserInfo_.userinfo.email)) {
-                        return OK();
-                    } else {
-                        return InternalError(RESTAPI::Errors::SMSTryLater);
-                    }
-                } else if (GetBoolParameter("completeValidation", false)) {
-
-                    if(!SMSSender()->Enabled()) {
-                        return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-                    }
-
-                    auto ChallengeCode = GetParameter("challengeCode", "");
-                    if (ChallengeCode.empty()) {
-                        return BadRequest(RESTAPI::Errors::SMSMissingChallenge);
-                    }
-                    if (MFC.sms.empty()) {
-                        return BadRequest(RESTAPI::Errors::SMSMissingPhoneNumber);
-                    }
-                    if (SMSSender()->CompleteValidation(MFC.sms, ChallengeCode, UserInfo_.userinfo.email)) {
-                        SecurityObjects::UserInfo User;
-
-                        StorageService()->SubDB().GetUserById(UserInfo_.userinfo.id, User);
-                        User.userTypeProprietaryInfo.mfa.enabled = true;
-                        User.userTypeProprietaryInfo.mfa.method = "sms";
-                        SecurityObjects::MobilePhoneNumber PhoneNumber;
-                        PhoneNumber.number = MFC.sms;
-                        PhoneNumber.primary = true;
-                        PhoneNumber.verified = true;
-                        User.userTypeProprietaryInfo.mobiles.clear();
-                        User.userTypeProprietaryInfo.mobiles.push_back(PhoneNumber);
-
-                        StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.id, User);
-
-                        MFC.sms = MFC.sms;
-                        MFC.type = "sms";
-                        MFC.email = UserInfo_.userinfo.email;
-                        MFC.id = MicroServiceCreateUUID();
-
-                        Poco::JSON::Object Answer;
-                        MFC.to_json(Answer);
-
-                        return ReturnObject(Answer);
-
-                    } else {
-                        return InternalError(RESTAPI::Errors::SMSTryLater);
-                    }
-                }
-            }
-        } catch (const Poco::Exception &E) {
-            Logger_.log(E);
-        }
-        return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-    }
-
-}

src/RESTAPI/RESTAPI_submfa_handler.h

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-12-01.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_submfa_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_submfa_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_PUT,
-                                                  Poco::Net::HTTPRequest::HTTP_GET,
-                                                  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                                  Server,
-                                                  TransactionId,
-                                                  Internal, true, false , RateLimit{.Interval=1000,.MaxCalls=10},
-                                                  true) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/submfa"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final ;
-    };
-}

src/RESTAPI/RESTAPI_suboauth2_handler.cpp

@@ -1,164 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#include "RESTAPI_suboauth2_handler.h"
-#include "AuthService.h"
-#include "MFAServer.h"
-#include "StorageService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_suboauth2_handler::DoGet() {
-        bool Expired = false, Contacted = false;
-        if (!IsAuthorized(Expired, Contacted, true)) {
-            if(Expired)
-                return UnAuthorized(RESTAPI::Errors::EXPIRED_TOKEN);
-            return UnAuthorized(RESTAPI::Errors::INVALID_TOKEN);
-        }
-        bool GetMe = GetBoolParameter(RESTAPI::Protocol::ME, false);
-        if(GetMe) {
-            Logger_.information(fmt::format("REQUEST-ME({}): Request for {}", Request->clientAddress().toString(),
-                                             UserInfo_.userinfo.email));
-            Poco::JSON::Object Me;
-            SecurityObjects::UserInfo   ReturnedUser = UserInfo_.userinfo;
-            Sanitize(UserInfo_, ReturnedUser);
-            ReturnedUser.to_json(Me);
-            return ReturnObject(Me);
-        }
-        BadRequest(RESTAPI::Errors::UnrecognizedRequest);
-    }
-
-    void RESTAPI_suboauth2_handler::DoDelete() {
-        auto Token = GetBinding(RESTAPI::Protocol::TOKEN, "");
-        std::string SessionToken;
-        try {
-            Poco::Net::OAuth20Credentials Auth(*Request);
-            if (Auth.getScheme() == "Bearer") {
-                SessionToken = Auth.getBearerToken();
-            }
-        } catch (const Poco::Exception &E) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        if (Token.empty() || (Token != SessionToken)) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        AuthService()->SubLogout(Token);
-        return ReturnStatus(Poco::Net::HTTPResponse::HTTP_NO_CONTENT, true);
-    }
-
-    void RESTAPI_suboauth2_handler::DoPost() {
-        const auto & Obj = ParsedBody_;
-        auto userId = GetS(RESTAPI::Protocol::USERID, Obj);
-        auto password = GetS(RESTAPI::Protocol::PASSWORD, Obj);
-        auto newPassword = GetS(RESTAPI::Protocol::NEWPASSWORD, Obj);
-        auto refreshToken = GetS("refreshToken", Obj);
-        auto grant_type = GetParameter("grant_type");
-
-        Poco::toLowerInPlace(userId);
-
-        if(!refreshToken.empty() && grant_type == "refresh_token") {
-            SecurityObjects::UserInfoAndPolicy UInfo;
-            if(AuthService()->RefreshSubToken(*Request, refreshToken, UInfo)) {
-                Poco::JSON::Object  Answer;
-                UInfo.webtoken.to_json(Answer);
-                return ReturnObject(Answer);
-            } else {
-                return UnAuthorized(RESTAPI::Errors::CANNOT_REFRESH_TOKEN);
-            }
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::REQUIREMENTS)) {
-            Logger_.information(fmt::format("POLICY-REQUEST({}): Request.", Request->clientAddress().toString()));
-            Poco::JSON::Object  Answer;
-            Answer.set(RESTAPI::Protocol::PASSWORDPATTERN, AuthService()->SubPasswordValidationExpression());
-            Answer.set(RESTAPI::Protocol::ACCESSPOLICY, AuthService()->GetSubAccessPolicy());
-            Answer.set(RESTAPI::Protocol::PASSWORDPOLICY, AuthService()->GetSubPasswordPolicy());
-            return ReturnObject(Answer);
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD)) {
-            SecurityObjects::UserInfo UInfo1;
-            auto UserExists = StorageService()->SubDB().GetUserByEmail(userId,UInfo1);
-            if(UserExists) {
-                Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}", Request->clientAddress().toString(), userId));
-                SecurityObjects::ActionLink NewLink;
-
-                NewLink.action = OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD;
-                NewLink.id = MicroServiceCreateUUID();
-                NewLink.userId = UInfo1.id;
-                NewLink.created = OpenWifi::Now();
-                NewLink.expires = NewLink.created + (24*60*60);
-                NewLink.userAction = false;
-                StorageService()->ActionLinksDB().CreateAction(NewLink);
-
-                Poco::JSON::Object ReturnObj;
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                UInfo.webtoken.userMustChangePassword = true;
-                UInfo.webtoken.to_json(ReturnObj);
-                return ReturnObject(ReturnObj);
-            } else {
-                Poco::JSON::Object ReturnObj;
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                UInfo.webtoken.userMustChangePassword = true;
-                UInfo.webtoken.to_json(ReturnObj);
-                return ReturnObject(ReturnObj);
-            }
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::RESENDMFACODE)) {
-            Logger_.information(fmt::format("RESEND-MFA-CODE({}): Request for {}", Request->clientAddress().toString(), userId));
-            if(Obj->has("uuid")) {
-                auto uuid = Obj->get("uuid").toString();
-                if(MFAServer()->ResendCode(uuid))
-                    return OK();
-            }
-            return UnAuthorized(RESTAPI::Errors::BAD_MFA_TRANSACTION);
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::COMPLETEMFACHALLENGE)) {
-            Logger_.information(fmt::format("COMPLETE-MFA-CHALLENGE({}): Request for {}", Request->clientAddress().toString(), userId));
-            if(Obj->has("uuid") && Obj->has("answer")) {
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                if(MFAServer()->CompleteMFAChallenge(Obj,UInfo)) {
-                    Poco::JSON::Object ReturnObj;
-                    UInfo.webtoken.to_json(ReturnObj);
-                    return ReturnObject(ReturnObj);
-                }
-            }
-            return UnAuthorized(RESTAPI::Errors::MFA_FAILURE);
-        }
-
-        SecurityObjects::UserInfoAndPolicy UInfo;
-        bool Expired=false;
-        auto Code=AuthService()->AuthorizeSub(userId, password, newPassword, UInfo, Expired);
-        if (Code==SUCCESS) {
-            Poco::JSON::Object ReturnObj;
-            if(AuthService()->RequiresMFA(UInfo)) {
-                if(MFAServer()->StartMFAChallenge(UInfo, ReturnObj)) {
-                    return ReturnObject(ReturnObj);
-                }
-                Logger_.warning("MFA Seems to be broken. Please fix. Disabling MFA checking for now.");
-            }
-            UInfo.webtoken.to_json(ReturnObj);
-            return ReturnObject(ReturnObj);
-        } else {
-            switch(Code) {
-                case INVALID_CREDENTIALS:
-                    return UnAuthorized(RESTAPI::Errors::INVALID_CREDENTIALS);
-                case PASSWORD_INVALID:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_INVALID);
-                case PASSWORD_ALREADY_USED:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_ALREADY_USED);
-                case USERNAME_PENDING_VERIFICATION:
-                    return UnAuthorized(RESTAPI::Errors::USERNAME_PENDING_VERIFICATION);
-                case PASSWORD_CHANGE_REQUIRED:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_CHANGE_REQUIRED);
-                default:
-                    return UnAuthorized(RESTAPI::Errors::INVALID_CREDENTIALS); break;
-            }
-            return;
-        }
-    }
-}

src/RESTAPI/RESTAPI_suboauth2_handler.h

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#pragma once
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_suboauth2_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_suboauth2_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
-                                                  Poco::Net::HTTPRequest::HTTP_DELETE,
-                                                  Poco::Net::HTTPRequest::HTTP_GET,
-                                                  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                                  Server,
-                                                  TransactionId,
-                                                  Internal, false, false , RateLimit{.Interval=1000,.MaxCalls=10},
-                                                  false) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/suboauth2/{token}","/api/v1/suboauth2"}; };
-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final;
-        void DoPut() final {};
-    };
-}

src/RESTAPI/RESTAPI_subpreferences.cpp

@@ -1,36 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-16.
-//
-
-#include "RESTAPI_subpreferences.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_subpreferences::DoGet() {
-        SecurityObjects::Preferences    P;
-        Poco::JSON::Object  Answer;
-        StorageService()->SubPreferencesDB().GetPreferences(UserInfo_.userinfo.id, P);
-        P.to_json(Answer);
-        ReturnObject(Answer);
-    }
-
-    void RESTAPI_subpreferences::DoPut() {
-
-        SecurityObjects::Preferences    P;
-
-        const auto & RawObject = ParsedBody_;
-        if(!P.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        P.id = UserInfo_.userinfo.id;
-        P.modified = OpenWifi::Now();
-        StorageService()->SubPreferencesDB().SetPreferences(P);
-
-        Poco::JSON::Object  Answer;
-        P.to_json(Answer);
-        ReturnObject(Answer);
-    }
-
-}

src/RESTAPI/RESTAPI_subpreferences.h

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-16.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_subpreferences : public RESTAPIHandler {
-    public:
-        RESTAPI_subpreferences(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{
-            Poco::Net::HTTPRequest::HTTP_GET,
-            Poco::Net::HTTPRequest::HTTP_PUT,
-            Poco::Net::HTTPRequest::HTTP_OPTIONS},
-            Server,
-            TransactionId,
-            Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subpreferences"}; };
-        void DoGet() final;
-        void DoPut() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-    };
-}

src/RESTAPI/RESTAPI_subtotp_handler.cpp

@@ -1,38 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-31.
-//
-
-#include "RESTAPI_subtotp_handler.h"
-
-#include "TotpCache.h"
-#include "framework/MicroServiceFuncs.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_subtotp_handler::DoGet() {
-
-        auto Reset = GetBoolParameter("reset",false);
-        std::string QRCode;
-
-        if(TotpCache()->StartValidation(UserInfo_.userinfo,true,QRCode,Reset)) {
-            return SendFileContent(QRCode, "image/svg+xml","qrcode.svg");
-        }
-        return BadRequest(RESTAPI::Errors::InvalidCommand);
-    }
-
-    void RESTAPI_subtotp_handler::DoPut() {
-        auto Value = GetParameter("value","");
-        auto nextIndex = GetParameter("index",0);
-        bool moreCodes=false;
-
-        RESTAPI::Errors::msg    Error;
-        if(TotpCache()->ContinueValidation(UserInfo_.userinfo,true,Value,nextIndex,moreCodes, Error )) {
-            Poco::JSON::Object Answer;
-            Answer.set("nextIndex", nextIndex);
-            Answer.set("moreCodes", moreCodes);
-            return ReturnObject(Answer);
-        }
-        return BadRequest(Error);
-    }
-
-}

src/RESTAPI/RESTAPI_subtotp_handler.h

@@ -1,29 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-31.
-//
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_subtotp_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_subtotp_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>
-                                         {
-                                                 Poco::Net::HTTPRequest::HTTP_GET,
-                                                 Poco::Net::HTTPRequest::HTTP_PUT,
-                                                 Poco::Net::HTTPRequest::HTTP_OPTIONS
-                                         },
-                                 Server,
-                                 TransactionId,
-                                 Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subtotp"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final;
-    private:
-
-    };
-}

src/RESTAPI/RESTAPI_subuser_handler.cpp

@@ -1,318 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#include "RESTAPI_subuser_handler.h"
-#include "StorageService.h"
-#include "framework/ow_constants.h"
-#include "SMSSender.h"
-#include "SMTPMailerService.h"
-#include "ACLProcessor.h"
-#include "AuthService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-#include "MFAServer.h"
-#include "TotpCache.h"
-
-#include "framework/MicroServiceFuncs.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_subuser_handler::DoGet() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        Poco::toLowerInPlace(Id);
-        std::string Arg;
-        SecurityObjects::UserInfo   UInfo;
-        if(HasParameter("byEmail",Arg) && Arg=="true") {
-            if(!StorageService()->SubDB().GetUserByEmail(Id,UInfo)) {
-                return NotFound();
-            }
-        } else if(!StorageService()->SubDB().GetUserById(Id,UInfo)) {
-            return NotFound();
-        }
-
-        Poco::JSON::Object  UserInfoObject;
-        Sanitize(UserInfo_, UInfo);
-        UInfo.to_json(UserInfoObject);
-        ReturnObject(UserInfoObject);
-    }
-
-    void RESTAPI_subuser_handler::DoDelete() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        SecurityObjects::UserInfo TargetUser;
-        if(!StorageService()->SubDB().GetUserById(Id,TargetUser)) {
-            return NotFound();
-        }
-
-        if(TargetUser.userRole != SecurityObjects::SUBSCRIBER) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        if(!Internal_ && !ACLProcessor::Can(UserInfo_.userinfo, TargetUser,ACLProcessor::DELETE)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(!StorageService()->SubDB().DeleteUser(UserInfo_.userinfo.email,Id)) {
-            return NotFound();
-        }
-
-        AuthService()->DeleteSubUserFromCache(Id);
-        StorageService()->SubTokenDB().RevokeAllTokens(TargetUser.email);
-        StorageService()->SubPreferencesDB().DeleteRecord("id", Id);
-        StorageService()->SubAvatarDB().DeleteRecord("id", Id);
-        Logger_.information(fmt::format("User '{}' deleted by '{}'.",Id,UserInfo_.userinfo.email));
-        OK();
-    }
-
-    void RESTAPI_subuser_handler::DoPost() {
-        std::string Id = GetBinding("id", "");
-        if(Id!="0") {
-            return BadRequest(RESTAPI::Errors::IdMustBe0);
-        }
-
-        SecurityObjects::UserInfo   NewUser;
-        const auto & RawObject = ParsedBody_;
-        if(!NewUser.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        if(NewUser.userRole == SecurityObjects::UNKNOWN || NewUser.userRole != SecurityObjects::SUBSCRIBER) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        Poco::toLowerInPlace(NewUser.email);
-        SecurityObjects::UserInfo   Existing;
-        if(StorageService()->SubDB().GetUserByEmail(NewUser.email,Existing)) {
-            return BadRequest(RESTAPI::Errors::UserAlreadyExists);
-        }
-
-        if(!Internal_ && !ACLProcessor::Can(UserInfo_.userinfo,NewUser,ACLProcessor::CREATE)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        Poco::toLowerInPlace(NewUser.email);
-        if(!Utils::ValidEMailAddress(NewUser.email)) {
-            return BadRequest(RESTAPI::Errors::InvalidEmailAddress);
-        }
-
-        if(!NewUser.currentPassword.empty()) {
-            if(!AuthService()->ValidateSubPassword(NewUser.currentPassword)) {
-                return BadRequest(RESTAPI::Errors::InvalidPassword);
-            }
-        }
-
-        if(NewUser.name.empty())
-            NewUser.name = NewUser.email;
-
-        //  You cannot enable MFA during user creation
-        NewUser.userTypeProprietaryInfo.mfa.enabled = false;
-        NewUser.userTypeProprietaryInfo.mfa.method = "";
-        NewUser.userTypeProprietaryInfo.mobiles.clear();
-        NewUser.userTypeProprietaryInfo.authenticatorSecret.clear();
-
-        if(!StorageService()->SubDB().CreateUser(UserInfo_.userinfo.email, NewUser)) {
-            Logger_.information(fmt::format("Could not add user '{}'.",NewUser.email));
-            return BadRequest(RESTAPI::Errors::RecordNotCreated);
-        }
-
-        if(GetParameter("email_verification","false")=="true") {
-            if(AuthService::VerifySubEmail(NewUser))
-                Logger_.information(fmt::format("Verification e-mail requested for {}",NewUser.email));
-            StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email,NewUser.id,NewUser);
-        }
-
-        if(!StorageService()->SubDB().GetUserByEmail(NewUser.email, NewUser)) {
-            Logger_.information(fmt::format("User '{}' but not retrieved.",NewUser.email));
-            return NotFound();
-        }
-
-        Poco::JSON::Object  UserInfoObject;
-        Sanitize(UserInfo_, NewUser);
-        NewUser.to_json(UserInfoObject);
-        ReturnObject(UserInfoObject);
-        Logger_.information(fmt::format("User '{}' has been added by '{}')",NewUser.email, UserInfo_.userinfo.email));
-    }
-
-    void RESTAPI_subuser_handler::DoPut() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        SecurityObjects::UserInfo   Existing;
-        if(!StorageService()->SubDB().GetUserById(Id,Existing)) {
-            return NotFound();
-        }
-
-        if(!Internal_ && !ACLProcessor::Can(UserInfo_.userinfo,Existing,ACLProcessor::MODIFY)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(GetBoolParameter("resetMFA")) {
-            if( (UserInfo_.userinfo.userRole == SecurityObjects::ROOT) ||
-                (UserInfo_.userinfo.userRole == SecurityObjects::ADMIN && Existing.userRole!=SecurityObjects::ROOT) ||
-                (UserInfo_.userinfo.id == Id)) {
-                Existing.userTypeProprietaryInfo.mfa.enabled = false;
-                Existing.userTypeProprietaryInfo.mfa.method.clear();
-                Existing.userTypeProprietaryInfo.mobiles.clear();
-                Existing.modified = OpenWifi::Now();
-                Existing.notes.push_back( SecurityObjects::NoteInfo{
-                        .created=OpenWifi::Now(),
-                        .createdBy=UserInfo_.userinfo.email,
-                        .note="MFA Reset by " + UserInfo_.userinfo.email});
-                StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email,Id,Existing);
-                SecurityObjects::UserInfo   NewUserInfo;
-                StorageService()->SubDB().GetUserByEmail(UserInfo_.userinfo.email,NewUserInfo);
-                Poco::JSON::Object  ModifiedObject;
-                Sanitize(UserInfo_, NewUserInfo);
-                NewUserInfo.to_json(ModifiedObject);
-                return ReturnObject(ModifiedObject);
-            } else {
-                return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-            }
-        }
-
-        if(GetBoolParameter("forgotPassword")) {
-            Existing.changePassword = true;
-            Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}", Request->clientAddress().toString(), Existing.email));
-
-            SecurityObjects::ActionLink NewLink;
-            NewLink.action = OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD;
-            NewLink.id = MicroServiceCreateUUID();
-            NewLink.userId = Existing.id;
-            NewLink.created = OpenWifi::Now();
-            NewLink.expires = NewLink.created + (24*60*60);
-            NewLink.userAction = false;
-            StorageService()->ActionLinksDB().CreateAction(NewLink);
-
-            return OK();
-        }
-
-        SecurityObjects::UserInfo   NewUser;
-        const auto & RawObject = ParsedBody_;
-        if(!NewUser.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        // some basic validations
-        if(RawObject->has("userRole") &&
-            (SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString())==SecurityObjects::UNKNOWN ||
-            SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString())==SecurityObjects::SUBSCRIBER)) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        // The only valid things to change are: changePassword, name,
-        AssignIfPresent(RawObject,"name", Existing.name);
-        AssignIfPresent(RawObject,"description", Existing.description);
-        AssignIfPresent(RawObject,"owner", Existing.owner);
-        AssignIfPresent(RawObject,"location", Existing.location);
-        AssignIfPresent(RawObject,"locale", Existing.locale);
-        AssignIfPresent(RawObject,"changePassword", Existing.changePassword);
-        AssignIfPresent(RawObject,"suspended", Existing.suspended);
-        AssignIfPresent(RawObject,"blackListed", Existing.blackListed);
-
-        if(RawObject->has("userRole")) {
-            auto NewRole = SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString());
-            if(NewRole!=Existing.userRole) {
-                if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && NewRole==SecurityObjects::ROOT) {
-                    return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-                }
-                if(Id==UserInfo_.userinfo.id) {
-                    return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-                }
-                Existing.userRole = NewRole;
-            }
-        }
-
-        if(RawObject->has("notes")) {
-            SecurityObjects::NoteInfoVec NIV;
-            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(RawObject->get("notes").toString());
-            for(auto const &i:NIV) {
-                SecurityObjects::NoteInfo   ii{.created=(uint64_t)OpenWifi::Now(), .createdBy=UserInfo_.userinfo.email, .note=i.note};
-                Existing.notes.push_back(ii);
-            }
-        }
-        if(RawObject->has("currentPassword")) {
-            if(!AuthService()->ValidateSubPassword(RawObject->get("currentPassword").toString())) {
-                return BadRequest(RESTAPI::Errors::InvalidPassword);
-            }
-            if(!AuthService()->SetPassword(RawObject->get("currentPassword").toString(),Existing)) {
-                return BadRequest(RESTAPI::Errors::PasswordRejected);
-            }
-        }
-
-        if(GetParameter("email_verification","false")=="true") {
-            if(AuthService::VerifySubEmail(Existing))
-                Logger_.information(fmt::format("Verification e-mail requested for {}",Existing.email));
-        }
-
-        if(RawObject->has("userTypeProprietaryInfo")) {
-            if(NewUser.userTypeProprietaryInfo.mfa.enabled) {
-                if (!MFAMETHODS::Validate(NewUser.userTypeProprietaryInfo.mfa.method)) {
-                    return BadRequest(RESTAPI::Errors::BadMFAMethod);
-                }
-
-                if( NewUser.userTypeProprietaryInfo.mfa.enabled &&
-                    NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS &&
-                    !SMSSender()->Enabled()) {
-                    return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-                }
-
-                if( NewUser.userTypeProprietaryInfo.mfa.enabled &&
-                    NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL &&
-                    !SMTPMailerService()->Enabled()) {
-                    return BadRequest(RESTAPI::Errors::EMailMFANotEnabled);
-                }
-
-                Existing.userTypeProprietaryInfo.mfa.method = NewUser.userTypeProprietaryInfo.mfa.method;
-                Existing.userTypeProprietaryInfo.mfa.enabled = true;
-
-                if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS) {
-                    if(NewUser.userTypeProprietaryInfo.mobiles.empty()) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
-                    if (!SMSSender()->IsNumberValid(NewUser.userTypeProprietaryInfo.mobiles[0].number,UserInfo_.userinfo.email)) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
-                    Existing.userTypeProprietaryInfo.mobiles = NewUser.userTypeProprietaryInfo.mobiles;
-                    Existing.userTypeProprietaryInfo.mobiles[0].verified = true;
-                    Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                } else if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::AUTHENTICATOR) {
-                    std::string Secret;
-                    Existing.userTypeProprietaryInfo.mobiles.clear();
-                    if(Existing.userTypeProprietaryInfo.authenticatorSecret.empty() && TotpCache()->CompleteValidation(UserInfo_.userinfo,false,Secret)) {
-                        Existing.userTypeProprietaryInfo.authenticatorSecret = Secret;
-                    } else if (!Existing.userTypeProprietaryInfo.authenticatorSecret.empty()) {
-                        // we allow someone to use their old secret
-                    } else {
-                        return BadRequest(RESTAPI::Errors::AuthenticatorVerificationIncomplete);
-                    }
-                } else if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL) {
-                    Existing.userTypeProprietaryInfo.mobiles.clear();
-                    Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                }
-            } else {
-                Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                Existing.userTypeProprietaryInfo.mobiles.clear();
-                Existing.userTypeProprietaryInfo.mfa.enabled = false;
-            }
-        }
-
-        if(StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email,Id,Existing)) {
-            SecurityObjects::UserInfo   NewUserInfo;
-            StorageService()->SubDB().GetUserById(Id,NewUserInfo);
-            Poco::JSON::Object  ModifiedObject;
-            Sanitize(UserInfo_, NewUserInfo);
-            NewUserInfo.to_json(ModifiedObject);
-            return ReturnObject(ModifiedObject);
-        }
-        BadRequest(RESTAPI::Errors::RecordNotUpdated);
-    }
-}

src/RESTAPI/RESTAPI_subuser_handler.h

@@ -1,31 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_subuser_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_subuser_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>
-                         {Poco::Net::HTTPRequest::HTTP_POST,
-                          Poco::Net::HTTPRequest::HTTP_GET,
-                          Poco::Net::HTTPRequest::HTTP_PUT,
-                          Poco::Net::HTTPRequest::HTTP_DELETE,
-                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                          Server,
-                          TransactionId,
-                          Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subuser/{id}"}; };
-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final;
-        void DoPut() final;
-    private:
-
-    };
-}

src/RESTAPI/RESTAPI_subusers_handler.cpp

@@ -1,79 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#include "RESTAPI_subusers_handler.h"
-#include "StorageService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_subusers_handler::DoGet() {
-        bool IdOnly = GetBoolParameter("idOnly");
-        auto operatorId = GetParameter("operatorId");
-        auto nameSearch = GetParameter("nameSearch");
-        auto emailSearch = GetParameter("emailSearch");
-
-        std::string baseQuery;
-        if(!nameSearch.empty() || !emailSearch.empty()) {
-            if(!nameSearch.empty())
-                baseQuery = fmt::format(" Lower(name) like('%{}%') ", Poco::toLower(nameSearch) );
-            if(!emailSearch.empty())
-                baseQuery += baseQuery.empty() ? fmt::format(" Lower(email) like('%{}%') ", Poco::toLower(emailSearch))
-                : fmt::format(" and Lower(email) like('%{}%') ", Poco::toLower(emailSearch));
-        }
-
-        if(QB_.CountOnly) {
-            std::string whereClause;
-            if(!operatorId.empty()) {
-                whereClause = baseQuery.empty() ? fmt::format(" owner='{}' ", operatorId) :
-                              fmt::format(" owner='{}' and {} ", operatorId, baseQuery);
-                auto count = StorageService()->SubDB().Count(whereClause);
-                return ReturnCountOnly(count);
-            }
-            auto count = StorageService()->UserDB().Count();
-            return ReturnCountOnly(count);
-        } else if(QB_.Select.empty()) {
-            std::string whereClause;
-            if(!operatorId.empty()) {
-                whereClause = baseQuery.empty() ? fmt::format(" owner='{}' ", operatorId) :
-                              fmt::format(" owner='{}' and {} ", operatorId, baseQuery);
-            }
-
-            SecurityObjects::UserInfoList   Users;
-            if (StorageService()->SubDB().GetUsers(QB_.Offset, QB_.Limit, Users.users, whereClause)) {
-                for (auto &i : Users.users) {
-                    Sanitize(UserInfo_, i);
-                }
-            }
-
-            if(IdOnly) {
-                Poco::JSON::Array   Arr;
-                Poco::JSON::Object  Answer;
-
-                for(const auto &i:Users.users) {
-                    Arr.add(i.id);
-                }
-                Answer.set("users",Arr);
-                return ReturnObject(Answer);
-            }
-
-            Poco::JSON::Object  Answer;
-            Users.to_json(Answer);
-            return ReturnObject(Answer);
-        } else {
-            SecurityObjects::UserInfoList   Users;
-            for(auto &i:SelectedRecords()) {
-                SecurityObjects::UserInfo   UInfo;
-                if(StorageService()->SubDB().GetUserById(i,UInfo)) {
-                    Poco::JSON::Object Obj;
-                    Sanitize(UserInfo_, UInfo);
-                    Users.users.emplace_back(UInfo);
-                }
-            }
-            Poco::JSON::Object Answer;
-            Users.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-    }
-}

src/RESTAPI/RESTAPI_subusers_handler.h

@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_subusers_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_subusers_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>
-                         {Poco::Net::HTTPRequest::HTTP_GET,
-                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                          Server,
-                          TransactionId,
-                          Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subusers"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-};

src/RESTAPI/RESTAPI_totp_handler.cpp

@@ -1,35 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-31.
-//
-
-#include "RESTAPI_totp_handler.h"
-#include "TotpCache.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_totp_handler::DoGet() {
-
-        auto Reset = GetBoolParameter("reset",false);
-        std::string QRCode;
-        if(TotpCache()->StartValidation(UserInfo_.userinfo,false,QRCode,Reset)) {
-            return SendFileContent(QRCode, "image/svg+xml","qrcode.svg");
-        }
-        return BadRequest(RESTAPI::Errors::InvalidCommand);
-    }
-
-    void RESTAPI_totp_handler::DoPut() {
-        auto Value = GetParameter("value","");
-        auto nextIndex = GetParameter("index",0);
-        bool moreCodes=false;
-
-        RESTAPI::Errors::msg Err;
-        if(TotpCache()->ContinueValidation(UserInfo_.userinfo,false,Value,nextIndex,moreCodes, Err)) {
-            Poco::JSON::Object Answer;
-            Answer.set("nextIndex", nextIndex);
-            Answer.set("moreCodes", moreCodes);
-            return ReturnObject(Answer);
-        }
-        return BadRequest(Err);
-    }
-
-}

src/RESTAPI/RESTAPI_totp_handler.h

@@ -1,31 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-31.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_totp_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_totp_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>
-                                         {
-                                              Poco::Net::HTTPRequest::HTTP_GET,
-                                              Poco::Net::HTTPRequest::HTTP_PUT,
-                                              Poco::Net::HTTPRequest::HTTP_OPTIONS
-                                          },
-                                 Server,
-                                 TransactionId,
-                                 Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/totp"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final;
-    private:
-
-    };
-}

src/RESTAPI/RESTAPI_user_handler.cpp

@@ -1,329 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-21.
-//
-
-#include "RESTAPI_user_handler.h"
-#include "StorageService.h"
-#include "framework/ow_constants.h"
-#include "SMSSender.h"
-#include "SMTPMailerService.h"
-#include "ACLProcessor.h"
-#include "AuthService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-#include "MFAServer.h"
-#include "TotpCache.h"
-#include "framework/MicroServiceFuncs.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_user_handler::DoGet() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        Poco::toLowerInPlace(Id);
-        std::string Arg;
-        SecurityObjects::UserInfo   UInfo;
-        if(HasParameter("byEmail",Arg) && Arg=="true") {
-            if(!StorageService()->UserDB().GetUserByEmail(Id,UInfo)) {
-                return NotFound();
-            }
-        } else if(!StorageService()->UserDB().GetUserById(Id,UInfo)) {
-            return NotFound();
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo, UInfo,ACLProcessor::READ)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        Poco::JSON::Object  UserInfoObject;
-        Sanitize(UserInfo_, UInfo);
-        UInfo.to_json(UserInfoObject);
-        ReturnObject(UserInfoObject);
-    }
-
-    void RESTAPI_user_handler::DoDelete() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        SecurityObjects::UserInfo UInfo;
-        if(!StorageService()->UserDB().GetUserById(Id,UInfo)) {
-            return NotFound();
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo, UInfo,ACLProcessor::DELETE)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(!StorageService()->UserDB().DeleteUser(UserInfo_.userinfo.email,Id)) {
-            return NotFound();
-        }
-
-        AuthService()->DeleteUserFromCache(Id);
-        StorageService()->AvatarDB().DeleteAvatar(UserInfo_.userinfo.email,Id);
-        StorageService()->PreferencesDB().DeletePreferences(UserInfo_.userinfo.email,Id);
-        StorageService()->UserTokenDB().RevokeAllTokens(Id);
-        StorageService()->ApiKeyDB().RemoveAllApiKeys(Id);
-        Logger_.information(fmt::format("User '{}' deleted by '{}'.",Id,UserInfo_.userinfo.email));
-        OK();
-    }
-
-    void RESTAPI_user_handler::DoPost() {
-
-        std::string Id = GetBinding("id", "");
-        if(Id!="0") {
-            return BadRequest(RESTAPI::Errors::IdMustBe0);
-        }
-
-        SecurityObjects::UserInfo   NewUser;
-        const auto & RawObject = ParsedBody_;
-        if(!NewUser.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        if(NewUser.userRole == SecurityObjects::UNKNOWN) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        if(UserInfo_.userinfo.userRole==SecurityObjects::ROOT) {
-            NewUser.owner = GetParameter("entity","");
-        } else {
-            NewUser.owner = UserInfo_.userinfo.owner;
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo,NewUser,ACLProcessor::CREATE)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        Poco::toLowerInPlace(NewUser.email);
-        if(!Utils::ValidEMailAddress(NewUser.email)) {
-            return BadRequest(RESTAPI::Errors::InvalidEmailAddress);
-        }
-
-        SecurityObjects::UserInfo   Existing;
-        if(StorageService()->SubDB().GetUserByEmail(NewUser.email,Existing)) {
-            return BadRequest(RESTAPI::Errors::UserAlreadyExists);
-        }
-
-        if(!NewUser.currentPassword.empty()) {
-            if(!AuthService()->ValidatePassword(NewUser.currentPassword)) {
-                return BadRequest(RESTAPI::Errors::InvalidPassword);
-            }
-        }
-
-        if(NewUser.name.empty())
-            NewUser.name = NewUser.email;
-
-        //  You cannot enable MFA during user creation
-        NewUser.userTypeProprietaryInfo.mfa.enabled = false;
-        NewUser.userTypeProprietaryInfo.mfa.method = "";
-        NewUser.userTypeProprietaryInfo.mobiles.clear();
-        NewUser.userTypeProprietaryInfo.authenticatorSecret.clear();
-        NewUser.validated = true;
-
-        if(!StorageService()->UserDB().CreateUser(NewUser.email,NewUser)) {
-            Logger_.information(fmt::format("Could not add user '{}'.",NewUser.email));
-            return BadRequest(RESTAPI::Errors::RecordNotCreated);
-        }
-
-        if(GetBoolParameter("email_verification")) {
-            if(AuthService::VerifyEmail(NewUser))
-                Logger_.information(fmt::format("Verification e-mail requested for {}",NewUser.email));
-            StorageService()->UserDB().UpdateUserInfo(UserInfo_.userinfo.email,NewUser.id,NewUser);
-        }
-
-        if(!StorageService()->UserDB().GetUserByEmail(NewUser.email, NewUser)) {
-            Logger_.information(fmt::format("User '{}' but not retrieved.",NewUser.email));
-            return NotFound();
-        }
-
-        Poco::JSON::Object  UserInfoObject;
-        Sanitize(UserInfo_, NewUser);
-        NewUser.to_json(UserInfoObject);
-        ReturnObject(UserInfoObject);
-        Logger_.information(fmt::format("User '{}' has been added by '{}')",NewUser.email, UserInfo_.userinfo.email));
-    }
-
-    void RESTAPI_user_handler::DoPut() {
-
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        SecurityObjects::UserInfo   Existing;
-        if(!StorageService()->UserDB().GetUserById(Id,Existing)) {
-            return NotFound();
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo,Existing,ACLProcessor::MODIFY)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(GetBoolParameter("resetMFA")) {
-            if( (UserInfo_.userinfo.userRole == SecurityObjects::ROOT) ||
-                (UserInfo_.userinfo.userRole == SecurityObjects::ADMIN && Existing.userRole!=SecurityObjects::ROOT) ||
-                (UserInfo_.userinfo.id == Id)) {
-                Existing.userTypeProprietaryInfo.mfa.enabled = false;
-                Existing.userTypeProprietaryInfo.mfa.method.clear();
-                Existing.userTypeProprietaryInfo.mobiles.clear();
-                Existing.modified = OpenWifi::Now();
-                Existing.notes.push_back( SecurityObjects::NoteInfo{
-                            .created=OpenWifi::Now(),
-                            .createdBy=UserInfo_.userinfo.email,
-                            .note="MFA Reset by " + UserInfo_.userinfo.email});
-                StorageService()->UserDB().UpdateUserInfo(UserInfo_.userinfo.email,Id,Existing);
-                SecurityObjects::UserInfo   NewUserInfo;
-                StorageService()->UserDB().GetUserByEmail(UserInfo_.userinfo.email,NewUserInfo);
-                Poco::JSON::Object  ModifiedObject;
-                Sanitize(UserInfo_, NewUserInfo);
-                NewUserInfo.to_json(ModifiedObject);
-                return ReturnObject(ModifiedObject);
-            } else {
-                return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-            }
-        }
-
-        if(GetBoolParameter("forgotPassword")) {
-            Existing.changePassword = true;
-            Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}", Request->clientAddress().toString(), Existing.email));
-            SecurityObjects::ActionLink NewLink;
-
-            NewLink.action = OpenWifi::SecurityObjects::LinkActions::FORGOT_PASSWORD;
-            NewLink.id = MicroServiceCreateUUID();
-            NewLink.userId = Existing.id;
-            NewLink.created = OpenWifi::Now();
-            NewLink.expires = NewLink.created + (24*60*60);
-            NewLink.userAction = true;
-            StorageService()->ActionLinksDB().CreateAction(NewLink);
-            return OK();
-        }
-
-        SecurityObjects::UserInfo   NewUser;
-        const auto & RawObject = ParsedBody_;
-        if(!NewUser.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        // some basic validations
-        if(RawObject->has("userRole") && SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString())==SecurityObjects::UNKNOWN) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        if(RawObject->has("owner")) {
-            if (UserInfo_.userinfo.userRole == SecurityObjects::ROOT && Existing.owner.empty()) {
-                AssignIfPresent(RawObject, "owner", Existing.owner);
-            }
-        }
-
-        // The only valid things to change are: changePassword, name,
-        AssignIfPresent(RawObject,"name", Existing.name);
-        AssignIfPresent(RawObject,"description", Existing.description);
-        AssignIfPresent(RawObject,"location", Existing.location);
-        AssignIfPresent(RawObject,"locale", Existing.locale);
-        AssignIfPresent(RawObject,"changePassword", Existing.changePassword);
-        AssignIfPresent(RawObject,"suspended", Existing.suspended);
-        AssignIfPresent(RawObject,"blackListed", Existing.blackListed);
-
-        if(RawObject->has("userRole")) {
-            auto NewRole = SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString());
-            if(NewRole!=Existing.userRole) {
-                if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && NewRole==SecurityObjects::ROOT) {
-                    return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-                }
-                if(Id==UserInfo_.userinfo.id) {
-                    return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-                }
-                Existing.userRole = NewRole;
-            }
-        }
-
-        if(RawObject->has("notes")) {
-            SecurityObjects::NoteInfoVec NIV;
-            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(RawObject->get("notes").toString());
-            for(auto const &i:NIV) {
-                SecurityObjects::NoteInfo   ii{.created=(uint64_t)OpenWifi::Now(), .createdBy=UserInfo_.userinfo.email, .note=i.note};
-                Existing.notes.push_back(ii);
-            }
-        }
-        if(RawObject->has("currentPassword")) {
-            if(!AuthService()->ValidatePassword(RawObject->get("currentPassword").toString())) {
-                return BadRequest(RESTAPI::Errors::InvalidPassword);
-            }
-            if(!AuthService()->SetPassword(RawObject->get("currentPassword").toString(),Existing)) {
-                return BadRequest(RESTAPI::Errors::PasswordRejected);
-            }
-        }
-
-        if(GetBoolParameter("email_verification")) {
-            if(AuthService::VerifyEmail(Existing))
-                Logger_.information(fmt::format("Verification e-mail requested for {}",Existing.email));
-        }
-
-        if(RawObject->has("userTypeProprietaryInfo")) {
-            if(NewUser.userTypeProprietaryInfo.mfa.enabled) {
-                if (!MFAMETHODS::Validate(NewUser.userTypeProprietaryInfo.mfa.method)) {
-                    return BadRequest(RESTAPI::Errors::BadMFAMethod);
-                }
-
-                if( NewUser.userTypeProprietaryInfo.mfa.enabled &&
-                    NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS &&
-                    !SMSSender()->Enabled()) {
-                    return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-                }
-
-                if( NewUser.userTypeProprietaryInfo.mfa.enabled &&
-                    NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL &&
-                    !SMTPMailerService()->Enabled()) {
-                    return BadRequest(RESTAPI::Errors::EMailMFANotEnabled);
-                }
-
-                Existing.userTypeProprietaryInfo.mfa.method = NewUser.userTypeProprietaryInfo.mfa.method;
-                Existing.userTypeProprietaryInfo.mfa.enabled = true;
-
-                if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS) {
-                    if(NewUser.userTypeProprietaryInfo.mobiles.empty()) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
-                    if (!SMSSender()->IsNumberValid(NewUser.userTypeProprietaryInfo.mobiles[0].number,UserInfo_.userinfo.email)) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
-                    Existing.userTypeProprietaryInfo.mobiles = NewUser.userTypeProprietaryInfo.mobiles;
-                    Existing.userTypeProprietaryInfo.mobiles[0].verified = true;
-                    Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                } else if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::AUTHENTICATOR) {
-                    std::string Secret;
-                    Existing.userTypeProprietaryInfo.mobiles.clear();
-                    if(Existing.userTypeProprietaryInfo.authenticatorSecret.empty() && TotpCache()->CompleteValidation(UserInfo_.userinfo,false,Secret)) {
-                        Existing.userTypeProprietaryInfo.authenticatorSecret = Secret;
-                    } else if (!Existing.userTypeProprietaryInfo.authenticatorSecret.empty()) {
-                        // we allow someone to use their old secret
-                    } else {
-                        return BadRequest(RESTAPI::Errors::AuthenticatorVerificationIncomplete);
-                    }
-                } else if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL) {
-                    Existing.userTypeProprietaryInfo.mobiles.clear();
-                    Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                }
-            } else {
-                Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                Existing.userTypeProprietaryInfo.mobiles.clear();
-                Existing.userTypeProprietaryInfo.mfa.enabled = false;
-            }
-        }
-
-        Existing.modified = OpenWifi::Now();
-        if(StorageService()->UserDB().UpdateUserInfo(UserInfo_.userinfo.email,Id,Existing)) {
-            SecurityObjects::UserInfo   NewUserInfo;
-            StorageService()->UserDB().GetUserByEmail(UserInfo_.userinfo.email,NewUserInfo);
-            Poco::JSON::Object  ModifiedObject;
-            Sanitize(UserInfo_, NewUserInfo);
-            NewUserInfo.to_json(ModifiedObject);
-            return ReturnObject(ModifiedObject);
-        }
-        BadRequest(RESTAPI::Errors::RecordNotUpdated);
-    }
-}

src/RESTAPI/RESTAPI_users_handler.cpp

@@ -1,57 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-21.
-//
-
-#include "RESTAPI_users_handler.h"
-#include "StorageService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-    void RESTAPI_users_handler::DoGet() {
-        bool IdOnly = (GetParameter("idOnly","false")=="true");
-        auto nameSearch = GetParameter("nameSearch");
-        auto emailSearch = GetParameter("emailSearch");
-
-        std::string baseQuery;
-        if(!nameSearch.empty() || !emailSearch.empty()) {
-            if(!nameSearch.empty())
-                baseQuery = fmt::format(" Lower(name) like('%{}%') ", Poco::toLower(nameSearch) );
-            if(!emailSearch.empty())
-                baseQuery += baseQuery.empty() ? fmt::format(" Lower(email) like('%{}%') ", Poco::toLower(emailSearch))
-                                               : fmt::format(" and Lower(email) like('%{}%') ", Poco::toLower(emailSearch));
-        }
-
-        if(QB_.Select.empty()) {
-            SecurityObjects::UserInfoList   Users;
-            if(StorageService()->UserDB().GetUsers(QB_.Offset, QB_.Limit, Users.users, baseQuery)) {
-                for (auto &i : Users.users) {
-                    Sanitize(UserInfo_, i);
-                }
-                if(IdOnly) {
-                    Poco::JSON::Array   Arr;
-                    for(const auto &i:Users.users)
-                        Arr.add(i.id);
-                    Poco::JSON::Object  Answer;
-                    Answer.set("users", Arr);
-                    return ReturnObject(Answer);
-                }
-            }
-            Poco::JSON::Object  Answer;
-            Users.to_json(Answer);
-            return ReturnObject(Answer);
-        } else {
-            SecurityObjects::UserInfoList   Users;
-            for(auto &i:SelectedRecords()) {
-                SecurityObjects::UserInfo   UInfo;
-                if(StorageService()->UserDB().GetUserById(i,UInfo)) {
-                    Poco::JSON::Object Obj;
-                    Sanitize(UserInfo_, UInfo);
-                    Users.users.emplace_back(UInfo);
-                }
-            }
-            Poco::JSON::Object Answer;
-            Users.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-    }
-}

src/RESTAPI/RESTAPI_validate_apikey.cpp

@@ -1,31 +0,0 @@
-//
-// Created by stephane bourque on 2022-11-07.
-//
-
-#include "RESTAPI_validate_apikey.h"
-#include "AuthService.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_validate_apikey::DoGet() {
-        Poco::URI URI(Request->getURI());
-        auto Parameters = URI.getQueryParameters();
-        for(auto const &i:Parameters) {
-            if (i.first == "apikey") {
-                //  can we find this token?
-                SecurityObjects::UserInfoAndPolicy SecObj;
-                bool Expired = false;
-                std::uint64_t expiresOn=0;
-                if (AuthService()->IsValidApiKey(i.second, SecObj.webtoken, SecObj.userinfo, Expired, expiresOn)) {
-                    Poco::JSON::Object Answer;
-                    SecObj.to_json(Answer);
-                    Answer.set("expiresOn", expiresOn);
-                    return ReturnObject(Answer);
-                }
-                return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-            }
-        }
-        return NotFound();
-    }
-
-} // OpenWifi

src/RESTAPI/RESTAPI_validate_apikey.h

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2022-11-07.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_validate_apikey : public RESTAPIHandler {
-    public:
-        RESTAPI_validate_apikey(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>
-                                         {Poco::Net::HTTPRequest::HTTP_GET,
-                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                 Server,
-                                 TransactionId,
-                                 Internal) {};
-        static auto PathName() { return std::list<std::string>{"/api/v1/validateApiKey"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}
-

src/RESTAPI/RESTAPI_validate_sub_token_handler.cpp

@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#include "RESTAPI_validate_sub_token_handler.h"
-#include "AuthService.h"
-
-namespace OpenWifi {
-    void RESTAPI_validate_sub_token_handler::DoGet() {
-        Poco::URI URI(Request->getURI());
-        auto Parameters = URI.getQueryParameters();
-        for(auto const &i:Parameters) {
-            if (i.first == "token") {
-                //  can we find this token?
-                SecurityObjects::UserInfoAndPolicy SecObj;
-                bool Expired = false;
-                if (AuthService()->IsValidSubToken(i.second, SecObj.webtoken, SecObj.userinfo, Expired)) {
-                    Poco::JSON::Object Obj;
-                    SecObj.to_json(Obj);
-                    return ReturnObject(Obj);
-                }
-            }
-        }
-        return NotFound();
-    }
-}

src/RESTAPI/RESTAPI_validate_sub_token_handler.h

@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_validate_sub_token_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_validate_sub_token_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>
-                         {Poco::Net::HTTPRequest::HTTP_GET,
-                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                          Server,
-                          TransactionId,
-                          Internal) {};
-        static auto PathName() { return std::list<std::string>{"/api/v1/validateSubToken"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}

src/RESTAPI_AssetServer.cpp

@@ -2,23 +2,26 @@
 // Created by stephane bourque on 2021-07-10.
 //
 
-#include "RESTAPI_asset_server.h"
+#include "RESTAPI_AssetServer.h"
 #include "Poco/File.h"
-#include "framework/ow_constants.h"
 #include "Daemon.h"
+#include "RESTAPI_server.h"
+#include "Utils.h"
+#include "RESTAPI_protocol.h"
 
 namespace OpenWifi {
-    void RESTAPI_asset_server::DoGet() {
+    void RESTAPI_AssetServer::DoGet() {
         Poco::File  AssetFile;
 
         if(Request->getURI().find("/favicon.ico") != std::string::npos) {
-            AssetFile = Daemon()->AssetDir() + "/favicon.ico";
+            AssetFile = RESTAPI_Server()->AssetDir() + "/favicon.ico";
         } else {
             std::string AssetName = GetBinding(RESTAPI::Protocol::ID, "");
-            AssetFile = Daemon()->AssetDir() + "/" + AssetName;
+            AssetFile = RESTAPI_Server()->AssetDir() + "/" + AssetName;
         }
         if(!AssetFile.isFile()) {
-            return NotFound();
+            NotFound();
+            return;
         }
         SendFile(AssetFile);
     }

src/RESTAPI_AssetServer.h

@@ -2,14 +2,15 @@
 // Created by stephane bourque on 2021-07-10.
 //
 
-#pragma once
+#ifndef UCENTRALSEC_RESTAPI_ASSETSERVER_H
+#define UCENTRALSEC_RESTAPI_ASSETSERVER_H
 
-#include "framework/RESTAPI_Handler.h"
+#include "RESTAPI_handler.h"
 
 namespace OpenWifi {
-    class RESTAPI_asset_server : public RESTAPIHandler {
+    class RESTAPI_AssetServer : public RESTAPIHandler {
     public:
-        RESTAPI_asset_server(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_AssetServer(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, bool Internal)
                 : RESTAPIHandler(bindings, L,
                                  std::vector<std::string>
                                          {Poco::Net::HTTPRequest::HTTP_POST,
@@ -18,9 +19,8 @@ namespace OpenWifi {
                                           Poco::Net::HTTPRequest::HTTP_DELETE,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
                                           Server,
-                                          TransactionId,
-                                          Internal, false) {}
-        static auto PathName() { return std::list<std::string>{"/wwwassets/{id}" ,
+                                          Internal) {}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/wwwassets/{id}" ,
                                                                                          "/favicon.ico"}; };
         void DoGet() final;
         void DoPost() final {};
@@ -32,3 +32,5 @@ namespace OpenWifi {
     };
 }
 
+
+#endif //UCENTRALSEC_RESTAPI_ASSETSERVER_H

src/RESTAPI_GenericServer.cpp

@@ -0,0 +1,5 @@
+//
+// Created by stephane bourque on 2021-09-15.
+//
+
+#include "RESTAPI_GenericServer.h"

src/RESTAPI_GenericServer.h

@@ -0,0 +1,78 @@
+//
+// Created by stephane bourque on 2021-09-15.
+//
+
+#ifndef OWPROV_RESTAPI_GENERICSERVER_H
+#define OWPROV_RESTAPI_GENERICSERVER_H
+
+#include <vector>
+#include <string>
+
+#include "Daemon.h"
+#include "Poco/StringTokenizer.h"
+#include "Poco/Net/HTTPRequest.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_GenericServer {
+    public:
+
+        enum {
+            LOG_GET=0,
+            LOG_DELETE,
+            LOG_PUT,
+            LOG_POST
+        };
+
+        void inline SetFlags(bool External, const std::string &Methods) {
+            Poco::StringTokenizer   Tokens(Methods,",");
+            auto Offset = (External ? 0 : 4);
+            for(const auto &i:Tokens) {
+                if(Poco::icompare(i,Poco::Net::HTTPRequest::HTTP_DELETE)==0)
+                    LogFlags_[Offset+LOG_DELETE]=true;
+                else if(Poco::icompare(i,Poco::Net::HTTPRequest::HTTP_PUT)==0)
+                    LogFlags_[Offset+LOG_PUT]=true;
+                else if(Poco::icompare(i,Poco::Net::HTTPRequest::HTTP_POST)==0)
+                    LogFlags_[Offset+LOG_POST]=true;
+                else if(Poco::icompare(i,Poco::Net::HTTPRequest::HTTP_GET)==0)
+                    LogFlags_[Offset+LOG_GET]=true;
+            }
+        }
+        inline void InitLogging() {
+            std::string Public = Daemon()->ConfigGetString("apilogging.public.methods","PUT,POST,DELETE");
+            SetFlags(true, Public);
+            std::string Private = Daemon()->ConfigGetString("apilogging.private.methods","PUT,POST,DELETE");
+            SetFlags(false, Private);
+
+            std::string PublicBadTokens = Daemon()->ConfigGetString("apilogging.public.badtokens.methods","");
+            LogBadTokens_[0] = (Poco::icompare(PublicBadTokens,"true")==0);
+            std::string PrivateBadTokens = Daemon()->ConfigGetString("apilogging.private.badtokens.methods","");
+            LogBadTokens_[1] = (Poco::icompare(PrivateBadTokens,"true")==0);
+        }
+
+        [[nodiscard]] inline bool LogIt(const std::string &Method, bool External) const {
+            auto Offset = (External ? 0 : 4);
+            if(Method == Poco::Net::HTTPRequest::HTTP_GET)
+                return LogFlags_[Offset+LOG_GET];
+            if(Method == Poco::Net::HTTPRequest::HTTP_POST)
+                return LogFlags_[Offset+LOG_POST];
+            if(Method == Poco::Net::HTTPRequest::HTTP_PUT)
+                return LogFlags_[Offset+LOG_PUT];
+            if(Method == Poco::Net::HTTPRequest::HTTP_DELETE)
+                return LogFlags_[Offset+LOG_DELETE];
+            return false;
+        };
+
+        [[nodiscard]] inline bool LogBadTokens(bool External) const {
+            return LogBadTokens_[ (External ? 0 : 1) ];
+        };
+
+    private:
+        std::array<bool,8>       LogFlags_{false};
+        std::array<bool,2>       LogBadTokens_{false};
+    };
+
+}
+
+
+#endif //OWPROV_RESTAPI_GENERICSERVER_H

src/RESTAPI_InternalServer.cpp

@@ -0,0 +1,80 @@
+//
+// Created by stephane bourque on 2021-06-29.
+//
+
+
+#include "Poco/URI.h"
+
+#include "RESTAPI_system_command.h"
+#include "RESTAPI_user_handler.h"
+#include "RESTAPI_users_handler.h"
+#include "RESTAPI_action_links.h"
+#include "RESTAPI_validateToken_handler.h"
+#include "RESTAPI_InternalServer.h"
+
+#include "Utils.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_InternalServer *RESTAPI_InternalServer::instance_ = nullptr;
+
+    RESTAPI_InternalServer::RESTAPI_InternalServer() noexcept:
+        SubSystemServer("RESTAPIInternalServer", "REST-ISRV", "openwifi.internal.restapi")
+    {
+    }
+
+    int RESTAPI_InternalServer::Start() {
+        Logger_.information("Starting.");
+        Server_.InitLogging();
+
+        for(const auto & Svr: ConfigServersList_) {
+            Logger_.information(Poco::format("Starting: %s:%s Keyfile:%s CertFile: %s", Svr.Address(), std::to_string(Svr.Port()),
+                                             Svr.KeyFile(),Svr.CertFile()));
+
+            auto Sock{Svr.CreateSecureSocket(Logger_)};
+
+            Svr.LogCert(Logger_);
+            if(!Svr.RootCA().empty())
+                Svr.LogCas(Logger_);
+
+            auto Params = new Poco::Net::HTTPServerParams;
+            Params->setMaxThreads(50);
+            Params->setMaxQueued(200);
+            Params->setKeepAlive(true);
+
+            auto NewServer = std::make_unique<Poco::Net::HTTPServer>(new InternalRequestHandlerFactory(Server_), Pool_, Sock, Params);
+            NewServer->start();
+            RESTServers_.push_back(std::move(NewServer));
+        }
+
+        return 0;
+    }
+
+    void RESTAPI_InternalServer::Stop() {
+        Logger_.information("Stopping ");
+        for( const auto & svr : RESTServers_ )
+            svr->stop();
+        RESTServers_.clear();
+    }
+
+    void RESTAPI_InternalServer::reinitialize(Poco::Util::Application &self) {
+        Daemon()->LoadConfigurationFile();
+        Logger_.information("Reinitializing.");
+        Stop();
+        Start();
+    }
+
+    Poco::Net::HTTPRequestHandler *InternalRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
+        Poco::URI uri(Request.getURI());
+        const auto & Path = uri.getPath();
+        RESTAPIHandler::BindingMap Bindings;
+        return RESTAPI_Router_I<
+                RESTAPI_users_handler,
+                RESTAPI_user_handler,
+                RESTAPI_system_command,
+                RESTAPI_action_links,
+                RESTAPI_validateToken_handler
+        >(Path,Bindings,Logger_, Server_);
+    }
+
+}

src/RESTAPI_InternalServer.h

@@ -0,0 +1,57 @@
+//
+// Created by stephane bourque on 2021-06-29.
+//
+
+#ifndef UCENTRALSEC_RESTAPI_INTERNALSERVER_H
+#define UCENTRALSEC_RESTAPI_INTERNALSERVER_H
+
+#include "SubSystemServer.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/NetException.h"
+#include "RESTAPI_GenericServer.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_InternalServer : public SubSystemServer {
+        public:
+            RESTAPI_InternalServer() noexcept;
+
+            static RESTAPI_InternalServer *instance() {
+                if (instance_ == nullptr) {
+                    instance_ = new RESTAPI_InternalServer;
+                }
+                return instance_;
+            }
+
+            int Start() override;
+            void Stop() override;
+            void reinitialize(Poco::Util::Application &self) override;
+
+        private:
+            static RESTAPI_InternalServer *instance_;
+            std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
+            Poco::ThreadPool	    Pool_;
+            RESTAPI_GenericServer   Server_;
+    };
+
+    inline RESTAPI_InternalServer * RESTAPI_InternalServer() { return RESTAPI_InternalServer::instance(); };
+
+    class InternalRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
+        public:
+        explicit InternalRequestHandlerFactory(RESTAPI_GenericServer & Server) :
+                    Logger_(RESTAPI_InternalServer()->Logger()),
+                    Server_(Server){}
+
+            Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
+        private:
+            Poco::Logger    & Logger_;
+            RESTAPI_GenericServer & Server_;
+    };
+
+
+} //   namespace
+
+#endif //UCENTRALSEC_RESTAPI_INTERNALSERVER_H

src/RESTAPI_SecurityObjects.cpp

@@ -0,0 +1,371 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include "Poco/JSON/Parser.h"
+#include "Poco/JSON/Stringifier.h"
+
+#include "RESTAPI_SecurityObjects.h"
+#include "RESTAPI_utils.h"
+
+using OpenWifi::RESTAPI_utils::field_to_json;
+using OpenWifi::RESTAPI_utils::field_from_json;
+
+namespace OpenWifi::SecurityObjects {
+
+	void AclTemplate::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"Read",Read_);
+		field_to_json(Obj,"ReadWrite",ReadWrite_);
+		field_to_json(Obj,"ReadWriteCreate",ReadWriteCreate_);
+		field_to_json(Obj,"Delete",Delete_);
+		field_to_json(Obj,"PortalLogin",PortalLogin_);
+	}
+
+	ResourceAccessType ResourceAccessTypeFromString(const std::string &s) {
+		if(!Poco::icompare(s,"READ")) return READ;
+		if(!Poco::icompare(s,"MODIFY")) return MODIFY;
+		if(!Poco::icompare(s,"DELETE")) return DELETE;
+		if(!Poco::icompare(s,"CREATE")) return CREATE;
+		if(!Poco::icompare(s,"TEST")) return TEST;
+		if(!Poco::icompare(s,"MOVE")) return MOVE;
+		return NONE;
+	}
+
+	std::string ResourceAccessTypeToString(const ResourceAccessType & T) {
+		switch(T) {
+		case READ: return "READ";
+		case MODIFY: return "MODIFY";
+		case DELETE: return "DELETE";
+		case CREATE: return "CREATE";
+		case TEST: return "TEST";
+		case MOVE: return "MOVE";
+		default: return "NONE";
+		}
+	}
+
+    USER_ROLE UserTypeFromString(const std::string &U) {
+        if (!Poco::icompare(U,"root"))
+            return ROOT;
+        else if (!Poco::icompare(U,"admin"))
+            return ADMIN;
+        else if (!Poco::icompare(U,"subscriber"))
+            return SUBSCRIBER;
+        else if (!Poco::icompare(U,"csr"))
+            return CSR;
+        else if (!Poco::icompare(U, "system"))
+            return SYSTEM;
+        else if (!Poco::icompare(U, "special"))
+            return SPECIAL;
+        return UNKNOWN;
+    }
+
+    std::string UserTypeToString(USER_ROLE U) {
+        switch(U) {
+            case UNKNOWN: return "unknown";
+            case ROOT: return "root";
+            case SUBSCRIBER: return "subscriber";
+            case CSR: return "csr";
+            case SYSTEM: return "system";
+            case SPECIAL: return "special";
+            case ADMIN: return "admin";
+            default: return "unknown";
+        }
+    }
+
+	bool AclTemplate::from_json(const Poco::JSON::Object::Ptr &Obj)  {
+		try {
+			field_from_json(Obj, "Read", Read_);
+			field_from_json(Obj, "ReadWrite", ReadWrite_);
+			field_from_json(Obj, "ReadWriteCreate", ReadWriteCreate_);
+			field_from_json(Obj, "Delete", Delete_);
+			field_from_json(Obj, "PortalLogin", PortalLogin_);
+			return true;
+		} catch(...) {
+		}
+		return false;
+	}
+
+	void WebToken::to_json(Poco::JSON::Object & Obj) const {
+		Poco::JSON::Object  AclTemplateObj;
+		acl_template_.to_json(AclTemplateObj);
+		field_to_json(Obj,"access_token",access_token_);
+		field_to_json(Obj,"refresh_token",refresh_token_);
+		field_to_json(Obj,"token_type",token_type_);
+		field_to_json(Obj,"expires_in",expires_in_);
+		field_to_json(Obj,"idle_timeout",idle_timeout_);
+		field_to_json(Obj,"created",created_);
+		field_to_json(Obj,"username",username_);
+        field_to_json(Obj,"userMustChangePassword",userMustChangePassword);
+        field_to_json(Obj,"errorCode", errorCode);
+		Obj.set("aclTemplate",AclTemplateObj);
+	}
+
+	bool WebToken::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			if (Obj->isObject("aclTemplate")) {
+				Poco::JSON::Object::Ptr AclTemplate = Obj->getObject("aclTemplate");
+				acl_template_.from_json(AclTemplate);
+			}
+			field_from_json(Obj, "access_token", access_token_);
+			field_from_json(Obj, "refresh_token", refresh_token_);
+			field_from_json(Obj, "token_type", token_type_);
+			field_from_json(Obj, "expires_in", expires_in_);
+			field_from_json(Obj, "idle_timeout", idle_timeout_);
+			field_from_json(Obj, "created", created_);
+			field_from_json(Obj, "username", username_);
+            field_from_json(Obj, "userMustChangePassword",userMustChangePassword);
+			return true;
+		} catch (...) {
+
+		}
+		return false;
+	}
+
+    void UserInfo::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"Id",Id);
+		field_to_json(Obj,"name",name);
+		field_to_json(Obj,"description", description);
+		field_to_json(Obj,"avatar", avatar);
+		field_to_json(Obj,"email", email);
+		field_to_json(Obj,"validated", validated);
+		field_to_json(Obj,"validationEmail", validationEmail);
+		field_to_json(Obj,"validationDate", validationDate);
+		field_to_json(Obj,"creationDate", creationDate);
+		field_to_json(Obj,"validationURI", validationURI);
+		field_to_json(Obj,"changePassword", changePassword);
+		field_to_json(Obj,"lastLogin", lastLogin);
+		field_to_json(Obj,"currentLoginURI", currentLoginURI);
+		field_to_json(Obj,"lastPasswordChange", lastPasswordChange);
+		field_to_json(Obj,"lastEmailCheck", lastEmailCheck);
+		field_to_json(Obj,"waitingForEmailCheck", waitingForEmailCheck);
+		field_to_json(Obj,"locale", locale);
+		field_to_json(Obj,"notes", notes);
+		field_to_json(Obj,"location", location);
+		field_to_json(Obj,"owner", owner);
+		field_to_json(Obj,"suspended", suspended);
+		field_to_json(Obj,"blackListed", blackListed);
+		field_to_json<USER_ROLE>(Obj,"userRole", userRole, UserTypeToString);
+		field_to_json(Obj,"userTypeProprietaryInfo", userTypeProprietaryInfo);
+		field_to_json(Obj,"securityPolicy", securityPolicy);
+		field_to_json(Obj,"securityPolicyChange", securityPolicyChange);
+		field_to_json(Obj,"currentPassword",currentPassword);
+		field_to_json(Obj,"lastPasswords",lastPasswords);
+		field_to_json(Obj,"oauthType",oauthType);
+		field_to_json(Obj,"oauthUserInfo",oauthUserInfo);
+    };
+
+    bool UserInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+			field_from_json(Obj,"Id",Id);
+			field_from_json(Obj,"name",name);
+			field_from_json(Obj,"description",description);
+			field_from_json(Obj,"avatar",avatar);
+			field_from_json(Obj,"email",email);
+			field_from_json(Obj,"validationEmail",validationEmail);
+			field_from_json(Obj,"validationURI",validationURI);
+			field_from_json(Obj,"currentLoginURI",currentLoginURI);
+			field_from_json(Obj,"locale",locale);
+			field_from_json(Obj,"notes",notes);
+			field_from_json<USER_ROLE>(Obj,"userRole",userRole, UserTypeFromString);
+			field_from_json(Obj,"securityPolicy",securityPolicy);
+			field_from_json(Obj,"userTypeProprietaryInfo",userTypeProprietaryInfo);
+			field_from_json(Obj,"validationDate",validationDate);
+			field_from_json(Obj,"creationDate",creationDate);
+			field_from_json(Obj,"lastLogin",lastLogin);
+			field_from_json(Obj,"lastPasswordChange",lastPasswordChange);
+			field_from_json(Obj,"lastEmailCheck",lastEmailCheck);
+			field_from_json(Obj,"securityPolicyChange",securityPolicyChange);
+			field_from_json(Obj,"validated",validated);
+			field_from_json(Obj,"changePassword",changePassword);
+			field_from_json(Obj,"waitingForEmailCheck",waitingForEmailCheck);
+			field_from_json(Obj,"suspended",suspended);
+			field_from_json(Obj,"blackListed",blackListed);
+			field_from_json(Obj,"currentPassword",currentPassword);
+			field_from_json(Obj,"lastPasswords",lastPasswords);
+			field_from_json(Obj,"oauthType",oauthType);
+			field_from_json(Obj,"oauthUserInfo",oauthUserInfo);
+            return true;
+        } catch (const Poco::Exception &E) {
+
+        }
+        return false;
+    };
+
+	void InternalServiceInfo::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"privateURI",privateURI);
+		field_to_json(Obj,"publicURI",publicURI);
+		field_to_json(Obj,"token",token);
+	};
+
+	bool InternalServiceInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj,"privateURI",privateURI);
+			field_from_json(Obj,"publicURI",publicURI);
+			field_from_json(Obj,"token",token);
+			return true;
+		} catch (...) {
+
+		}
+		return false;
+	};
+
+	void InternalSystemServices::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"key",key);
+		field_to_json(Obj,"version",version);
+		field_to_json(Obj,"services",services);
+	};
+
+	bool InternalSystemServices::from_json(const Poco::JSON::Object::Ptr &Obj)  {
+		try {
+			field_from_json(Obj, "key", key);
+			field_from_json(Obj, "version", version);
+			field_from_json(Obj, "services", services);
+			return true;
+		} catch(...) {
+
+		}
+		return false;
+	};
+
+	void SystemEndpoint::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"type",type);
+		field_to_json(Obj,"id",id);
+		field_to_json(Obj,"vendor",vendor);
+		field_to_json(Obj,"uri",uri);
+		field_to_json(Obj,"authenticationType",authenticationType);
+	};
+
+	bool SystemEndpoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj, "type", type);
+			field_from_json(Obj, "id", id);
+			field_from_json(Obj, "vendor", vendor);
+			field_from_json(Obj, "uri", uri);
+			field_from_json(Obj, "authenticationType", authenticationType);
+			return true;
+		} catch (...) {
+
+		}
+		return false;
+	};
+
+	void SystemEndpointList::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"endpoints",endpoints);
+	}
+
+	bool SystemEndpointList::from_json(const Poco::JSON::Object::Ptr &Obj)  {
+		try {
+			field_from_json(Obj, "endpoints", endpoints);
+			return true;
+		} catch (...) {
+
+		}
+		return false;
+	}
+
+	void UserInfoAndPolicy::to_json(Poco::JSON::Object &Obj) const {
+		Poco::JSON::Object	UI, TI;
+		userinfo.to_json(UI);
+		webtoken.to_json(TI);
+		Obj.set("tokenInfo",TI);
+		Obj.set("userInfo",UI);
+	}
+
+	bool UserInfoAndPolicy::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj, "tokenInfo", webtoken);
+			field_from_json(Obj, "userInfo", userinfo);
+			return true;
+		} catch(...) {
+
+		}
+		return false;
+	}
+
+	void NoteInfo::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"created", created);
+		field_to_json(Obj,"createdBy", createdBy);
+		field_to_json(Obj,"note", note);
+	}
+
+	bool NoteInfo::from_json(Poco::JSON::Object::Ptr Obj) {
+		try {
+			field_from_json(Obj,"created",created);
+			field_from_json(Obj,"createdBy",createdBy);
+			field_from_json(Obj,"note",note);
+		} catch(...) {
+
+		}
+		return false;
+	}
+
+    bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes) {
+	    try {
+	        SecurityObjects::NoteInfoVec NIV;
+	        NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get("notes").toString());
+	        for(auto const &i:NIV) {
+	            SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
+	            Notes.push_back(ii);
+	        }
+	    } catch(...) {
+
+	    }
+	    return false;
+	}
+
+	void ProfileAction::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"resource", resource);
+		field_to_json<ResourceAccessType>(Obj,"access", access, ResourceAccessTypeToString);
+	}
+
+	bool ProfileAction::from_json(Poco::JSON::Object::Ptr Obj) {
+		try {
+			field_from_json(Obj,"resource",resource);
+			field_from_json<ResourceAccessType>(Obj,"access",access,ResourceAccessTypeFromString );
+		} catch(...) {
+
+		}
+		return false;
+	}
+
+	void SecurityProfile::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"id", id);
+		field_to_json(Obj,"name", name);
+		field_to_json(Obj,"description", description);
+		field_to_json(Obj,"policy", policy);
+		field_to_json(Obj,"role", role);
+		field_to_json(Obj,"notes", notes);
+	}
+
+	bool SecurityProfile::from_json(Poco::JSON::Object::Ptr Obj) {
+		try {
+			field_from_json(Obj,"id",id);
+			field_from_json(Obj,"name",name);
+			field_from_json(Obj,"description",description);
+			field_from_json(Obj,"policy",policy);
+			field_from_json(Obj,"role",role);
+			field_from_json(Obj,"notes",notes);
+		} catch(...) {
+
+		}
+		return false;
+	}
+
+	void SecurityProfileList::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj, "profiles", profiles);
+	}
+
+	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr Obj) {
+		try {
+			field_from_json(Obj,"profiles",profiles);
+		} catch(...) {
+
+		}
+		return false;
+	}
+}
+

src/RESTAPI_SecurityObjects.h

@@ -0,0 +1,181 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRAL_RESTAPI_SECURITYOBJECTS_H
+#define UCENTRAL_RESTAPI_SECURITYOBJECTS_H
+
+#include "Poco/JSON/Object.h"
+#include "OpenWifiTypes.h"
+
+namespace OpenWifi::SecurityObjects {
+
+	struct AclTemplate {
+		bool Read_ = true;
+		bool ReadWrite_ = true;
+		bool ReadWriteCreate_ = true;
+		bool Delete_ = true;
+		bool PortalLogin_ = true;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);	};
+
+	struct WebToken {
+		std::string access_token_;
+		std::string refresh_token_;
+		std::string id_token_;
+		std::string token_type_;
+		std::string username_;
+		bool userMustChangePassword=false;
+        uint64_t errorCode=0;
+		uint64_t expires_in_=0;
+		uint64_t idle_timeout_=0;
+		AclTemplate acl_template_;
+		uint64_t created_=0;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+    enum USER_ROLE {
+        UNKNOWN, ROOT, ADMIN, SUBSCRIBER, CSR, SYSTEM, SPECIAL
+    };
+
+    USER_ROLE UserTypeFromString(const std::string &U);
+    std::string UserTypeToString(USER_ROLE U);
+
+    struct NoteInfo {
+		uint64_t created = std::time(nullptr);
+		std::string createdBy;
+		std::string note;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<NoteInfo>	NoteInfoVec;
+
+	struct UserInfo {
+        std::string Id;
+		std::string name;
+		std::string description;
+		std::string avatar;
+		std::string email;
+		bool validated = false;
+		std::string validationEmail;
+		uint64_t validationDate = 0;
+		uint64_t creationDate = 0;
+		std::string validationURI;
+		bool changePassword = false;
+		uint64_t lastLogin = 0;
+		std::string currentLoginURI;
+		uint64_t lastPasswordChange = 0;
+		uint64_t lastEmailCheck = 0;
+		bool waitingForEmailCheck = false;
+		std::string locale;
+		NoteInfoVec notes;
+		std::string location;
+		std::string owner;
+		bool suspended = false;
+		bool blackListed = false;
+        USER_ROLE userRole;
+		std::string userTypeProprietaryInfo;
+		std::string securityPolicy;
+		uint64_t securityPolicyChange = 0 ;
+		std::string currentPassword;
+		Types::StringVec lastPasswords;
+		std::string oauthType;
+		std::string oauthUserInfo;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<UserInfo>   UserInfoVec;
+
+	bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
+
+	struct InternalServiceInfo {
+		std::string privateURI;
+		std::string publicURI;
+		std::string token;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<InternalServiceInfo>	InternalServiceInfoVec;
+
+	struct InternalSystemServices {
+		std::string key;
+		std::string version;
+		InternalServiceInfoVec services;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct SystemEndpoint {
+		std::string type;
+		uint64_t 	id = 0;
+		std::string vendor{"OpenWiFi"};
+		std::string uri;
+		std::string authenticationType{"internal_v1"};
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<SystemEndpoint> SystemEndpointVec;
+
+	struct SystemEndpointList {
+		SystemEndpointVec	endpoints;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct UserInfoAndPolicy {
+		WebToken	webtoken;
+		UserInfo	userinfo;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::map<std::string,SecurityObjects::UserInfoAndPolicy>	UserInfoCache;
+
+	enum ResourceAccessType {
+		NONE,
+		READ,
+		MODIFY,
+		DELETE,
+		CREATE,
+		TEST,
+		MOVE
+	};
+
+	ResourceAccessType ResourceAccessTypeFromString(const std::string &s);
+	std::string ResourceAccessTypeToString(const ResourceAccessType & T);
+
+	struct ProfileAction {
+		std::string resource;
+		ResourceAccessType access;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<ProfileAction>	ProfileActionVec;
+
+	struct SecurityProfile {
+		uint64_t id=0;
+		std::string name;
+		std::string description;
+		ProfileActionVec policy;
+		std::string role;
+		NoteInfoVec notes;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<SecurityProfile> SecurityProfileVec;
+
+	struct SecurityProfileList {
+		SecurityProfileVec profiles;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+}
+
+#endif //UCENTRAL_RESTAPI_SECURITYOBJECTS_H

src/RESTAPI_action_links.cpp

@@ -0,0 +1,132 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+
+#include "RESTAPI_action_links.h"
+#include "StorageService.h"
+#include "Utils.h"
+#include "RESTAPI_utils.h"
+
+#include "Poco/JSON/Parser.h"
+#include "Poco/Net/HTMLForm.h"
+#include "RESTAPI_server.h"
+#include "Daemon.h"
+
+namespace OpenWifi {
+    void RESTAPI_action_links::DoGet() {
+
+        auto Action = GetParameter("action","");
+        auto Id = GetParameter("id","");
+
+        if(Action=="password_reset")
+            RequestResetPassword(Id);
+        else if(Action=="email_verification")
+            DoEmailVerification(Id);
+        else
+            DoReturnA404();
+    }
+
+    void RESTAPI_action_links::DoPost() {
+        auto Action = GetParameter("action","");
+        auto Id = GetParameter("id","");
+
+        Logger_.information(Poco::format("COMPLETE-PASSWORD-RESET(%s): For ID=%s", Request->clientAddress().toString(), Id));
+        if(Action=="password_reset")
+            CompleteResetPassword(Id);
+        else
+            DoReturnA404();
+    }
+
+    void RESTAPI_action_links::RequestResetPassword(std::string &Id) {
+        Logger_.information(Poco::format("REQUEST-PASSWORD-RESET(%s): For ID=%s", Request->clientAddress().toString(), Id));
+        Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset.html"};
+        Types::StringPairVec    FormVars{ {"UUID", Id},
+                                          {"PASSWORD_VALIDATION", AuthService()->PasswordValidationExpression()}};
+        SendHTMLFileBack(FormFile,FormVars);
+    }
+
+    void RESTAPI_action_links::CompleteResetPassword(std::string &Id) {
+        //  form has been posted...
+        RESTAPI_PartHandler PartHandler;
+        Poco::Net::HTMLForm Form(*Request, Request->stream(), PartHandler);
+        if (!Form.empty()) {
+            auto Password1 = Form.get("password1","bla");
+            auto Password2 = Form.get("password1","blu");
+            Id = Form.get("id","");
+            if(Password1!=Password2 || !AuthService()->ValidatePassword(Password2) || !AuthService()->ValidatePassword(Password1)) {
+                Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_error.html"};
+                Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                  {"ERROR_TEXT", "For some reason, the passwords entered do not match or they do not comply with"
+                                                                 " accepted password creation restrictions. Please consult our on-line help"
+                                                                 " to look at the our password policy. If you would like to contact us, please mention"
+                                                                 " id(" + Id + ")"}};
+                SendHTMLFileBack(FormFile,FormVars);
+                return;
+            }
+
+            SecurityObjects::UserInfo   UInfo;
+            if(!Storage()->GetUserById(Id,UInfo)) {
+                Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_error.html"};
+                Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                  {"ERROR_TEXT", "This request does not contain a valid user ID. Please contact your system administrator."}};
+                SendHTMLFileBack(FormFile,FormVars);
+                return;
+            }
+
+            if(UInfo.blackListed || UInfo.suspended) {
+                Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_error.html"};
+                Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                  {"ERROR_TEXT", "Please contact our system administrators. We have identified an error in your account that must be resolved first."}};
+                SendHTMLFileBack(FormFile,FormVars);
+                return;
+            }
+
+            if(!AuthService()->SetPassword(Password1,UInfo)) {
+                Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_error.html"};
+                Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                  {"ERROR_TEXT", "You cannot reuse one of your recent passwords."}};
+                SendHTMLFileBack(FormFile,FormVars);
+                return;
+            }
+            Storage()->UpdateUserInfo(UInfo.email,Id,UInfo);
+            Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_success.html"};
+            Types::StringPairVec    FormVars{ {"UUID", Id},
+                                              {"USERNAME", UInfo.email},
+                                              {"ACTION_LINK",Daemon()->GetUIURI()}};
+            SendHTMLFileBack(FormFile,FormVars);
+        } else {
+            DoReturnA404();
+        }
+    }
+
+    void RESTAPI_action_links::DoEmailVerification(std::string &Id) {
+        SecurityObjects::UserInfo UInfo;
+
+        Logger_.information(Poco::format("EMAIL-VERIFICATION(%s): For ID=%s", Request->clientAddress().toString(), Id));
+        if (!Storage()->GetUserById(Id, UInfo)) {
+            Types::StringPairVec FormVars{{"UUID",       Id},
+                                          {"ERROR_TEXT", "This does not appear to be a valid email verification link.."}};
+            Poco::File FormFile{RESTAPI_Server()->AssetDir() + "/email_verification_error.html"};
+            SendHTMLFileBack(FormFile, FormVars);
+            return;
+        }
+
+        UInfo.waitingForEmailCheck = false;
+        UInfo.validated = true;
+        UInfo.lastEmailCheck = std::time(nullptr);
+        UInfo.validationDate = std::time(nullptr);
+        Storage()->UpdateUserInfo(UInfo.email, Id, UInfo);
+        Types::StringPairVec FormVars{{"UUID",     Id},
+                                      {"USERNAME", UInfo.email},
+                                      {"ACTION_LINK",Daemon()->GetUIURI()}};
+        Poco::File FormFile{RESTAPI_Server()->AssetDir() + "/email_verification_success.html"};
+        SendHTMLFileBack(FormFile, FormVars);
+    }
+
+    void RESTAPI_action_links::DoReturnA404() {
+        Types::StringPairVec FormVars;
+        Poco::File FormFile{RESTAPI_Server()->AssetDir() + "/404_error.html"};
+        SendHTMLFileBack(FormFile, FormVars);
+    }
+
+}

src/RESTAPI_action_links.h

@@ -0,0 +1,43 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+
+#ifndef UCENTRALSEC_RESTAPI_ACTION_LINKS_H
+#define UCENTRALSEC_RESTAPI_ACTION_LINKS_H
+
+
+#include "RESTAPI_handler.h"
+#include "Poco/Net/PartHandler.h"
+#include "Poco/Message.h"
+#include "Poco/Net/MessageHeader.h"
+#include "Poco/Net/NameValueCollection.h"
+#include "Poco/NullStream.h"
+#include "Poco/StreamCopier.h"
+#include "Poco/CountingStream.h"
+
+namespace OpenWifi {
+    class RESTAPI_action_links : public RESTAPIHandler {
+    public:
+        RESTAPI_action_links(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, bool Internal)
+                : RESTAPIHandler(bindings, L,
+             std::vector<std::string>{
+                                        Poco::Net::HTTPRequest::HTTP_GET,
+                                        Poco::Net::HTTPRequest::HTTP_POST,
+                                        Poco::Net::HTTPRequest::HTTP_OPTIONS},
+                                        Server,
+                                        Internal,
+                                        false) {}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/actionLink"}; };
+        void RequestResetPassword(std::string &Id);
+        void CompleteResetPassword(std::string &Id);
+        void DoEmailVerification(std::string &Id);
+        void DoReturnA404();
+
+        void DoGet() final;
+        void DoPost() final;
+        void DoDelete() final {};
+        void DoPut() final {};
+    };
+}
+
+#endif //UCENTRALSEC_RESTAPI_ACTION_LINKS_H