Chg: update image tag in helm values to v2.6.0

https://telecominfraproject.atlassian.net/browse/WIFI-10040

.github/workflows/ci.yml

@@ -13,6 +13,7 @@ on:
   pull_request:
     branches:
       - main
+      - 'release/*'
 
 defaults:
   run:
@@ -25,41 +26,78 @@ jobs:
       DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
       DOCKER_REGISTRY_USERNAME: ucentral
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Build Docker image
-      run: docker build -t wlan-cloud-owfms:${{ github.sha }} .
-
-    - name: Tag Docker image
-      run: |
-        TAGS="${{ github.sha }}"
-        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
-        echo "Result tags: $TAGS"
-        for tag in $TAGS; do
-          docker tag wlan-cloud-owfms:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/owfms:$tag
-        done
-    - 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
+    - name: Checkout actions repo
+      uses: actions/checkout@v2
       with:
-        registry: ${{ env.DOCKER_REGISTRY_URL }}
-        username: ${{ env.DOCKER_REGISTRY_USERNAME }}
-        password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+        repository: Telecominfraproject/.github
+        path: github
 
-    - name: Push Docker images
-      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
+    - name: Build and push Docker image
+      uses: ./github/composite-actions/docker-image-build
+      with:
+        image_name: owfms
+        registry: tip-tip-wlan-cloud-ucentral.jfrog.io
+        registry_user: ucentral
+        registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
+    - 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 OWFMS 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
       run: |
-        docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/owfms | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {}
+        echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/})
+        echo ::set-output name=owgw_branch::$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')
+
+    - name: Checkout actions repo
+      uses: actions/checkout@v2
+      with:
+        repository: Telecominfraproject/.github
+        path: github
+
+    - 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": "${{ env.BASE_BRANCH }}", "owfms_version": "${{ github.sha }}", "owprov_version": "${{ env.BASE_BRANCH }}", "owanalytics_version": "${{ env.BASE_BRANCH }}", "owsub_version": "${{ env.BASE_BRANCH }}", "microservice": "owfms"}'
+
+  trigger-deploy-to-dev:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    needs:
+      - docker
+    steps:
+    - name: Checkout actions repo
+      uses: actions/checkout@v2
+      with:
+        repository: Telecominfraproject/.github
+        path: github
+
+    - name: Trigger deployment of the latest version to dev instance and wait for result
+      uses: ./github/composite-actions/trigger-workflow-and-wait
+      with:
+        owner: Telecominfraproject
+        repo: wlan-testing
+        workflow: ucentralgw-dev-deployment.yaml
+        token: ${{ secrets.WLAN_TESTING_PAT }}
+        ref: master
+        inputs: '{"force_latest": "true"}'

.github/workflows/cleanup.yml

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

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

@@ -0,0 +1,24 @@
+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@v2
+        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/release.yml

@@ -0,0 +1,46 @@
+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@v2
+        with:
+          path: wlan-cloud-ucentralfms
+
+      - name: Build package
+        working-directory: wlan-cloud-ucentralfms/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-ucentralfms/helm
+        run: |
+          pip3 install yq -q
+          echo "Docker image - tip-tip-wlan-cloud-ucentral.jfrog.io/owfms:$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-ucentralfms/helm/release.txt
+          files: wlan-cloud-ucentralfms/helm/dist/*

.gitignore

@@ -20,5 +20,4 @@ _deps
 *.zip
 result.json
 pidfile
-
-
+test_scripts/curl/result.json

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owfms VERSION 2.2.0)
+project(owfms VERSION 2.6.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -15,27 +15,35 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build)
-    file(READ build BUILD_NUM)
+    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/build BUILD_NUM)
     if(BUILD_INCREMENT)
         MATH(EXPR BUILD_NUM "${BUILD_NUM}+1")
-        file(WRITE build ${BUILD_NUM})
+        file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
     endif()
 else()
     set(BUILD_NUM 1)
-    file(WRITE build ${BUILD_NUM})
+    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
 endif()
 
-set(BUILD_SHARED_LIBS 1)
-add_definitions(-DAPP_VERSION="${CMAKE_PROJECT_VERSION}" -DBUILD_NUMBER="${BUILD_NUM}" -DAWS_CUSTOM_MEMORY_MANAGEMENT)
+find_package(Git QUIET)
+if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+    execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            RESULT_VARIABLE GIT_RESULT
+            OUTPUT_VARIABLE GIT_HASH)
+    if(NOT GIT_RESULT EQUAL "0")
+        message(FATAL_ERROR "git describe --always --tags failed with ${GIT_RESULT}")
+    endif()
+    string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
+endif()
 
-set(Boost_USE_STATIC_LIBS OFF)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
+# set(BUILD_SHARED_LIBS 1)
+# add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
 
-find_package(Boost      REQUIRED system)
 find_package(OpenSSL    REQUIRED)
-find_package(AWSSDK     REQUIRED COMPONENTS s3)
+find_package(fmt        REQUIRED)
 find_package(Poco       REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
+find_package(AWSSDK     REQUIRED COMPONENTS s3)
 
 if(SMALL_BUILD)
     find_package(Poco REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
@@ -48,51 +56,59 @@ endif()
 
 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_compile_options(-Wall -Wextra)
+if(ASAN)
+    add_compile_options(-fsanitize=address)
+    add_link_options(-fsanitize=address)
+endif()
+
 add_executable( owfms
-                build
-                src/Dashboard.cpp src/Dashboard.h
-                src/Daemon.cpp src/Daemon.h
-                src/StorageService.cpp src/StorageService.h
-                src/storage_tables.cpp
-                src/storage_setup.cpp
-                src/SubSystemServer.cpp src/SubSystemServer.h
-                src/RESTAPI_handler.cpp src/RESTAPI_handler.h
-                src/storage_firmwares.cpp
-                src/Utils.cpp src/Utils.h
-                src/RESTAPI_server.cpp src/RESTAPI_server.h
-                src/RESTAPI_firmwaresHandler.cpp src/RESTAPI_firmwaresHandler.h
-                src/RESTAPI_firmwareHandler.cpp src/RESTAPI_firmwareHandler.h
-                src/RESTAPI_GWobjects.cpp src/RESTAPI_GWobjects.h
-                src/ALBHealthCheckServer.h
-                src/ManifestCreator.cpp src/ManifestCreator.h
-                src/KafkaManager.cpp src/KafkaManager.h
-                src/MicroService.h src/MicroService.cpp
-                src/AuthClient.h src/AuthClient.cpp
-                src/RESTAPI_SecurityObjects.cpp src/RESTAPI_SecurityObjects.h
-                src/RESTAPI_system_command.cpp src/RESTAPI_system_command.h
-                src/OpenAPIRequest.h src/OpenAPIRequest.cpp
-                src/RESTAPI_InternalServer.cpp src/RESTAPI_InternalServer.h
-                src/RESTAPI_utils.cpp src/RESTAPI_utils.h
-                src/RESTAPI_FMSObjects.cpp src/RESTAPI_FMSObjects.h
-                src/storage_firmwares.h src/storage_history.cpp
-                src/storage_history.h src/storage_deviceTypes.cpp
-                src/RESTAPI_historyHandler.cpp src/RESTAPI_historyHandler.h
-                src/NewConnectionHandler.cpp src/NewConnectionHandler.h
-                src/LatestFirmwareCache.cpp src/LatestFirmwareCache.h
-                src/DeviceCache.cpp src/DeviceCache.h
-                src/RESTAPI_firmwareAgeHandler.cpp src/RESTAPI_firmwareAgeHandler.h
-                src/storage_deviceInfo.cpp src/storage_deviceInfo.h
-                src/RESTAPI_connectedDevicesHandler.cpp src/RESTAPI_connectedDevicesHandler.h
-                src/FirmwareCache.cpp src/FirmwareCache.h
-                src/RESTAPI_connectedDeviceHandler.cpp src/RESTAPI_connectedDeviceHandler.h
-                src/RESTAPI_deviceReportHandler.cpp src/RESTAPI_deviceReportHandler.h
-                src/RESTAPI_GenericServer.cpp src/RESTAPI_GenericServer.h
-                src/OpenWifiTypes.h
-                src/RESTAPI_errors.h)
+        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/ow_constants.h
+        src/framework/WebSocketClientNotifications.h
+        src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
+        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
+        src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
+        src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
+        src/RESTAPI/RESTAPI_firmwaresHandler.cpp src/RESTAPI/RESTAPI_firmwaresHandler.h
+        src/RESTAPI/RESTAPI_firmwareHandler.cpp src/RESTAPI/RESTAPI_firmwareHandler.h
+        src/RESTAPI/RESTAPI_historyHandler.cpp src/RESTAPI/RESTAPI_historyHandler.h
+        src/RESTAPI/RESTAPI_firmwareAgeHandler.cpp src/RESTAPI/RESTAPI_firmwareAgeHandler.h
+        src/RESTAPI/RESTAPI_connectedDevicesHandler.cpp src/RESTAPI/RESTAPI_connectedDevicesHandler.h
+        src/RESTAPI/RESTAPI_deviceReportHandler.cpp src/RESTAPI/RESTAPI_deviceReportHandler.h
+        src/RESTAPI/RESTAPI_connectedDeviceHandler.cpp src/RESTAPI/RESTAPI_connectedDeviceHandler.h
+        src/RESTAPI/RESTAPI_Routers.cpp
+        src/Dashboard.cpp src/Dashboard.h
+        src/Daemon.cpp src/Daemon.h
+        src/StorageService.cpp src/StorageService.h
+        src/ManifestCreator.cpp src/ManifestCreator.h
+        src/framework/MicroService.h
+        src/NewConnectionHandler.cpp src/NewConnectionHandler.h
+        src/LatestFirmwareCache.cpp src/LatestFirmwareCache.h
+        src/DeviceCache.cpp src/DeviceCache.h
+        src/FirmwareCache.cpp src/FirmwareCache.h
+        src/SDK/Prov_SDK.cpp src/SDK/Prov_SDK.h
+        src/AutoUpdater.cpp src/AutoUpdater.h src/SDK/GW_SDK.cpp src/SDK/GW_SDK.h
+        src/NewCommandHandler.cpp src/NewCommandHandler.h
+        src/storage/orm_history.cpp src/storage/orm_history.h
+        src/storage/orm_firmwares.cpp src/storage/orm_firmwares.h
+        src/storage/orm_deviceInfo.cpp src/storage/orm_deviceInfo.h src/RESTAPI/RESTAPI_deviceInformation_handler.cpp src/RESTAPI/RESTAPI_deviceInformation_handler.h)
 
-target_link_libraries(owfms PUBLIC
-        ${Poco_LIBRARIES} ${MySQL_LIBRARIES}
-        ${Boost_LIBRARIES}
-        ${ZLIB_LIBRARIES} ${AWSSDK_LINK_LIBRARIES}
-        CppKafka::cppkafka )
+target_link_libraries( owfms PUBLIC
+        ${Poco_LIBRARIES}
+        ${MySQL_LIBRARIES}
+        ${ZLIB_LIBRARIES}
+        ${AWSSDK_LINK_LIBRARIES}
+        fmt::fmt
+        CppKafka::cppkafka
+    )
 

Dockerfile

@@ -1,34 +1,16 @@
-FROM alpine AS builder
+FROM alpine:3.15 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 curl-dev util-linux-dev \
+    make cmake g++ git \
     unixodbc-dev postgresql-dev mariadb-dev \
-    librdkafka-dev
+    librdkafka-dev boost-dev openssl-dev \
+    zlib-dev nlohmann-json \
+    curl-dev
 
+FROM build-base AS poco-build
+
+ADD https://api.github.com/repos/stephb9959/poco/git/refs/heads/master version.json
 RUN git clone https://github.com/stephb9959/poco /poco
-RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
-RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp /aws-sdk-cpp
-
-WORKDIR /aws-sdk-cpp
-RUN mkdir cmake-build
-WORKDIR cmake-build
-RUN cmake .. -DBUILD_ONLY="s3" \
-             -DCMAKE_BUILD_TYPE=Release \
-             -DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=uninitialized" \ 
-             -DAUTORUN_UNIT_TESTS=OFF
-RUN cmake --build . --config Release -j8
-RUN cmake --build . --target install
-
-WORKDIR /cppkafka
-RUN mkdir cmake-build
-WORKDIR cmake-build
-RUN cmake ..
-RUN cmake --build . --config Release -j8
-RUN cmake --build . --target install
 
 WORKDIR /poco
 RUN mkdir cmake-build
@@ -37,17 +19,84 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install
 
+FROM build-base AS fmtlib-build
+
+ADD https://api.github.com/repos/fmtlib/fmt/git/refs/heads/master version.json
+RUN git clone https://github.com/fmtlib/fmt /fmtlib
+
+WORKDIR /fmtlib
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake ..
+RUN make
+RUN make install
+
+FROM build-base AS cppkafka-build
+
+ADD https://api.github.com/repos/stephb9959/cppkafka/git/refs/heads/master version.json
+RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
+
+WORKDIR /cppkafka
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake ..
+RUN cmake --build . --config Release -j8
+RUN cmake --build . --target install
+
+FROM build-base AS json-schema-validator-build
+
+ADD https://api.github.com/repos/pboettch/json-schema-validator/git/refs/heads/master version.json
+RUN git clone https://github.com/pboettch/json-schema-validator /json-schema-validator
+
+WORKDIR /json-schema-validator
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake ..
+RUN make
+RUN make install
+
+FROM build-base AS aws-sdk-cpp-build
+
+ADD https://api.github.com/repos/aws/aws-sdk-cpp/git/refs/heads/main version.json
+RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp /aws-sdk-cpp
+
+WORKDIR /aws-sdk-cpp
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake .. -DBUILD_ONLY="sns;s3" \
+             -DCMAKE_BUILD_TYPE=Release \
+             -DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=uninitialized" \
+             -DAUTORUN_UNIT_TESTS=OFF
+RUN cmake --build . --config Release -j8
+RUN cmake --build . --target install
+
+FROM build-base AS owfms-build
+
 ADD CMakeLists.txt build /owfms/
 ADD cmake /owfms/cmake
 ADD src /owfms/src
+ADD .git /owfms/.git
+
+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
+COPY --from=json-schema-validator-build /usr/local/include /usr/local/include
+COPY --from=json-schema-validator-build /usr/local/lib /usr/local/lib
+COPY --from=aws-sdk-cpp-build /usr/local/include /usr/local/include
+COPY --from=aws-sdk-cpp-build /usr/local/lib /usr/local/lib
+COPY --from=fmtlib-build /usr/local/include /usr/local/include
+COPY --from=fmtlib-build /usr/local/lib /usr/local/lib
 
 WORKDIR /owfms
 RUN mkdir cmake-build
 WORKDIR /owfms/cmake-build
-RUN cmake ..
+RUN cmake .. \
+          -Dcrypto_LIBRARY=/usr/lib/libcrypto.so \
+          -DBUILD_SHARED_LIBS=ON
 RUN cmake --build . --config Release -j8
 
-FROM alpine
+FROM alpine:3.15
 
 ENV OWFMS_USER=owfms \
     OWFMS_ROOT=/owfms-data \
@@ -59,19 +108,26 @@ RUN addgroup -S "$OWFMS_USER" && \
 RUN mkdir /openwifi
 RUN mkdir -p "$OWFMS_ROOT" "$OWFMS_CONFIG" && \
     chown "$OWFMS_USER": "$OWFMS_ROOT" "$OWFMS_CONFIG"
-RUN apk add --update --no-cache librdkafka curl-dev mariadb-connector-c libpq unixodbc su-exec gettext ca-certificates
 
-COPY --from=builder /owfms/cmake-build/owfms /openwifi/owfms
-COPY --from=builder /cppkafka/cmake-build/src/lib/* /lib/
-COPY --from=builder /poco/cmake-build/lib/* /lib/
-COPY --from=builder /aws-sdk-cpp/cmake-build/aws-cpp-sdk-core/libaws-cpp-sdk-core.so /lib/
-COPY --from=builder /aws-sdk-cpp/cmake-build/aws-cpp-sdk-s3/libaws-cpp-sdk-s3.so /lib/
+RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \
+    mariadb-connector-c libpq unixodbc postgresql-client
 
-COPY owfms.properties.tmpl ${OWFMS_CONFIG}/
+COPY readiness_check /readiness_check
+COPY test_scripts/curl/cli /cli
+
+COPY owfms.properties.tmpl /
 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.pem
 
+COPY --from=owfms-build /owfms/cmake-build/owfms /openwifi/owfms
+COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib
+COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib
+COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-core/libaws-cpp-sdk-core.so /usr/local/lib
+COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-s3/libaws-cpp-sdk-s3.so /usr/local/lib
+COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-sns/libaws-cpp-sdk-sns.so /usr/local/lib
+
 EXPOSE 16004 17004 16104
 
 ENTRYPOINT ["/docker-entrypoint.sh"]

build

@@ -1 +1 @@
-49
+46

docker-entrypoint.sh

@@ -5,7 +5,7 @@ if [ "$SELFSIGNED_CERTS" = 'true' ]; then
     update-ca-certificates
 fi
 
-if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWFMS_CONFIG"/owfms.properties ]]; then
+if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\$OWFMS_ROOT/certs/restapi-ca.pem"} \
   RESTAPI_HOST_PORT=${RESTAPI_HOST_PORT:-"16004"} \
   RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\$OWFMS_ROOT/certs/restapi-cert.pem"} \
@@ -29,6 +29,10 @@ if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWFMS_CONFIG"/owfms.properties ]]; t
   S3_BUCKET_URI=${S3_BUCKET_URI:-"ucentral-ap-firmware.s3.amazonaws.com"} \
   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:-""} \
   STORAGE_TYPE=${STORAGE_TYPE:-"sqlite"} \
   STORAGE_TYPE_POSTGRESQL_HOST=${STORAGE_TYPE_POSTGRESQL_HOST:-"localhost"} \
   STORAGE_TYPE_POSTGRESQL_USERNAME=${STORAGE_TYPE_POSTGRESQL_USERNAME:-"owfms"} \
@@ -40,7 +44,7 @@ if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWFMS_CONFIG"/owfms.properties ]]; t
   STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owfms"} \
   STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owfms"} \
   STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-  envsubst < $OWFMS_CONFIG/owfms.properties.tmpl > $OWFMS_CONFIG/owfms.properties
+  envsubst < /owfms.properties.tmpl > $OWFMS_CONFIG/owfms.properties
 fi
 
 if [ "$1" = '/openwifi/owfms' -a "$(id -u)" = '0' ]; then

helm/Chart.yaml

@@ -5,14 +5,14 @@ name: owfms
 version: 0.1.0
 dependencies:
 - name: postgresql
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
   version: 10.9.2
   condition: postgresql.enabled
 - name: mysql
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
   version: 8.8.3
   condition: mysql.enabled
 - name: mariadb
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
   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-ucentralfms@helm?ref=main
+$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm/owfms-0.1.0.tgz?ref=main
 ```
 
 The command deploys the Firmware on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.

helm/templates/_helpers.tpl

@@ -30,3 +30,13 @@ Create chart name and version as used by the chart label.
 {{- define "owfms.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "owfms.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

@@ -13,6 +13,7 @@ spec:
   replicas: {{ .Values.replicaCount }}
   strategy:
     type: {{ .Values.strategyType }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "owfms.name" . }}
@@ -24,6 +25,9 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include "owfms.config" . | sha256sum }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       labels:
         app.kubernetes.io/name: {{ include "owfms.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
@@ -32,6 +36,16 @@ 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
+
       containers:
 
         - name: owfms

helm/templates/ingress.yaml

@@ -2,7 +2,7 @@
 {{- range $ingress, $ingressValue := .Values.ingresses }}
 {{- if $ingressValue.enabled }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "owfms.ingress.apiVersion" $root }}
 kind: Ingress
 metadata:
   name: {{ include "owfms.fullname" $root }}-{{ $ingress }}
@@ -36,9 +36,23 @@ 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 "owfms.fullname" $root }}-{{ .serviceName }}
+              port:
+              {{- if kindIs "string" .servicePort }}
+                name: {{ .servicePort }}
+              {{- else }}
+                number: {{ .servicePort }}
+              {{- end }}
+            {{- else }}
             serviceName: {{ include "owfms.fullname" $root }}-{{ .serviceName }}
             servicePort: {{ .servicePort }}
+            {{- end }}
       {{- end }}
   {{- end }}
 

helm/values.yaml

@@ -1,6 +1,7 @@
 # System
 replicaCount: 1
 strategyType: Recreate
+revisionHistoryLimit: 2
 
 nameOverride: ""
 fullnameOverride: ""
@@ -8,16 +9,20 @@ fullnameOverride: ""
 images:
   owfms:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owfms
-    tag: main
+    tag: v2.6.0
     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:
   owfms:
-    type: LoadBalancer
+    type: ClusterIP
     ports:
       restapi:
         servicePort: 16004
@@ -35,9 +40,9 @@ checks:
         path: /
         port: 16104
     readiness:
-      httpGet:
-        path: /
-        port: 16104
+      exec:
+        command:
+          - /readiness_check
 
 ingresses:
   restapi:
@@ -49,6 +54,7 @@ ingresses:
     - restapi.chart-example.local
     paths:
     - path: /
+      pathType: ImplementationSpecific
       serviceName: owfms
       servicePort: restapi
 
@@ -91,6 +97,8 @@ tolerations: []
 
 affinity: {}
 
+podAnnotations: {}
+
 persistence:
   enabled: true
   # storageClassName: "-"
@@ -103,8 +111,16 @@ persistence:
 public_env_variables:
   OWFMS_ROOT: /owfms-data
   OWFMS_CONFIG: /owfms-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
+  #OWSEC: gw-qa01.cicd.lab.wlan.tip.build:16001
 
-secret_env_variables: {}
+secret_env_variables:
+  # NOTE in order for readiness check to use system info method you need to override these values to the real OWSEC credentials
+  OWSEC_USERNAME: tip@ucentral.com
+  OWSEC_PASSWORD: openwifi
 
 configProperties:
   # -> Public part
@@ -139,6 +155,10 @@ 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
@@ -168,22 +188,9 @@ configProperties:
   openwifi.system.uri.ui: https://localhost
   openwifi.system.commandchannel: /tmp/app_owfms
   # Logging
-  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_owfms
-  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
+  logging.type: console
+  logging.path: $OWFMS_ROOT/logs
+  logging.level: debug
 
   # -> Secret part
   # REST API

openapi/owfms.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.1
 info:
   title: uCentral Firmware Service API
   description: A process to manage new uCentral firmware distribution.
-  version: 2.0.0
+  version: 2.5.0
   license:
     name: BSD3
     url: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
@@ -50,6 +50,21 @@ components:
             properties:
               ErrorCode:
                 type: integer
+                enum:
+                  - 0     # Success
+                  - 1     # PASSWORD_CHANGE_REQUIRED,
+                  - 2     # INVALID_CREDENTIALS,
+                  - 3     # PASSWORD_ALREADY_USED,
+                  - 4     # USERNAME_PENDING_VERIFICATION,
+                  - 5     # PASSWORD_INVALID,
+                  - 6     # INTERNAL_ERROR,
+                  - 7     # ACCESS_DENIED,
+                  - 8     # INVALID_TOKEN
+                  - 9     # EXPIRED_TOKEN
+                  - 10    # RATE_LIMIT_EXCEEDED
+                  - 11    # BAD_MFA_TRANSACTION
+                  - 12    # MFA_FAILURE
+                  - 13    # SECURITY_SERVICE_UNREACHABLE
               ErrorDetails:
                 type: string
               ErrorDescription:
@@ -125,6 +140,25 @@ components:
           items:
             $ref: '#/components/schemas/FirmwareDetails'
 
+    DeviceCurrentInfo:
+      type: object
+      properties:
+        serialNumber:
+          type: string
+        revision:
+          type: string
+        upgraded:
+          type: integer
+          format: int64
+
+    DeviceCurrentInfoList:
+      type: object
+      properties:
+        devices:
+          type: array
+          items:
+            $ref: '#/components/schemas/DeviceCurrentInfo'
+
     RevisionHistoryEntry:
       type: object
       properties:
@@ -242,6 +276,26 @@ components:
         totalSecondsOld:
           $ref: '#/components/schemas/TagIntPairList'
 
+    DeviceInformation:
+      type: object
+      properties:
+        serialNumber:
+          type: string
+        history:
+          $ref: '#/components/schemas/RevisionHistoryEntryList'
+        currentFirmware:
+          type: string
+        currentFirmwareDate:
+          type: integer
+          format: int64
+        latestFirmware:
+          type: string
+        latestFirmwareDate:
+          type: integer
+          format: int64
+        latestFirmwareAvailable:
+          type: boolean
+
     #########################################################################################
     ##
     ## These are endpoints that all services in the uCentral stack must provide
@@ -440,9 +494,10 @@ paths:
           required: false
         - in: query
           name: latestOnly
-          description: Return only the latest firwares
+          description: Return only the latest firmware
           schema:
             type: boolean
+            default: false
           required: false
         - in: query
           name: deviceType
@@ -453,19 +508,28 @@ paths:
           name: revisionSet
           schema:
             type: boolean
+            default: false
           required: false
         - in: query
           name: deviceSet
           schema:
             type: boolean
           required: false
+        - in: query
+          name: rcOnly
+          schema:
+            type: boolean
+            default: false
+          required: false
       responses:
         200:
           description: List firmwares
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/FirmwareDetailsList'
+                oneOf:
+                  - $ref: '#/components/schemas/FirmwareDetailsList'
+                  - $ref: '#/components/schemas/FirmwareDetails'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -612,13 +676,31 @@ paths:
           schema:
             type: string
           required: false
+        - in: query
+          description: Return current device list and current firmware
+          name: currentList
+          schema:
+            type: boolean
+            default: false
+          required: false
+          example: You must set {serialNumber} to 000000000000
+        - in: query
+          description: Return current device list and current firmware
+          name: unknownList
+          schema:
+            type: boolean
+            default: false
+          required: false
+          example: You must set {serialNumber} to 000000000000
       responses:
         200:
           description: List of device history upgrade.
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/RevisionHistoryEntryList'
+                oneOf:
+                  - $ref: '#/components/schemas/RevisionHistoryEntryList'
+                  - $ref: '#/components/schemas/DeviceCurrentInfoList'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -773,6 +855,28 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
+  /deviceInformation/{serialNumber}:
+    get:
+      tags:
+        - Device Information
+      summary: receive a repor on a single decide
+      parameters:
+        - in: path
+          name: serialNumber
+          schema:
+            type: string
+            example:
+              aabbccdd1234
+          required: true
+      responses:
+        200:
+          $ref: '#/components/schemas/DeviceInformation'
+        403:
+          $ref: '#/components/responses/Unauthorized'
+        404:
+          $ref: '#/components/responses/NotFound'
+
+
   #########################################################################################
   ##
   ## These are endpoints that all services in the uCentral stack must provide

owfms.properties

@@ -35,6 +35,7 @@ openwifi.system.uri.private = https://localhost:17004
 openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16004
 openwifi.system.commandchannel = /tmp/app.owfms
 openwifi.system.uri.ui = ucentral-ui.arilia.com
+
 firmwaredb.refresh = 1800
 firmwaredb.maxage = 90
 
@@ -48,6 +49,7 @@ s3.key =  *******************************************
 s3.retry = 60
 s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com
 
+autoupdater.enabled = true
 
 #############################
 # Generic information for all micro services
@@ -67,6 +69,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 =
 
 #
 # This section select which form of persistence you need
@@ -107,37 +113,9 @@ storage.type.mysql.connectiontimeout = 60
 # Logging: please leave as is for now.
 #
 ########################################################################
-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 = $OWFMS_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
+logging.type = file
+logging.path = $OWFMS_ROOT/logs
+logging.level = debug
 
 
 

owfms.properties.tmpl

@@ -67,6 +67,10 @@ 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}
 
 #
 # This section select which form of persistence you need
@@ -104,37 +108,6 @@ storage.type.mysql.connectiontimeout = 60
 # Logging: please leave as is for now.
 #
 ########################################################################
-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
-
-
-
+logging.type = console
+logging.path = $OWFMS_ROOT/logs
+logging.level = debug

readiness_check

@@ -0,0 +1,65 @@
+#!/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}" == "" ]]
+  then
+    echo "You must set the variable OWSEC in order to use this script. Something like"
+    echo "OWSEC=security.isp.com:16001"
+    exit 1
+  fi
+
+  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
+
+  # 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} -X POST -H "Content-Type: application/json" -d "$payload" "https://${OWSEC}/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 owfms instance
+  export RESTAPI_PORT=$(grep 'openwifi.restapi.host.0.port' $OWFMS_CONFIG/owfms.properties | awk -F '=' '{print $2}' | xargs | envsubst)
+  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' $OWFMS_CONFIG/owfms.properties | awk -F '=' '{print $2}' | xargs | envsubst)
+  curl localhost:$ALB_PORT
+fi

src/ALBHealthCheckServer.h

@@ -1,118 +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.
-//
-
-#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/AuthClient.cpp

@@ -1,93 +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 <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

@@ -1,45 +0,0 @@
-//
-// 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/AutoUpdater.cpp

@@ -0,0 +1,104 @@
+//
+// Created by stephane bourque on 2021-10-04.
+//
+
+#include "AutoUpdater.h"
+#include "SDK/Prov_SDK.h"
+#include "SDK/GW_SDK.h"
+#include "LatestFirmwareCache.h"
+#include "StorageService.h"
+
+namespace OpenWifi {
+
+    int AutoUpdater::Start() {
+        AutoUpdaterEnabled_ = MicroService::instance().ConfigGetBool("autoupdater.enabled", false);
+        if(AutoUpdaterEnabled_) {
+            Running_ = false;
+            AutoUpdaterFrequency_ = MicroService::instance().ConfigGetInt("autoupdater.frequency",600);
+            AutoUpdaterCallBack_ = std::make_unique<Poco::TimerCallback<AutoUpdater>>(*this, &AutoUpdater::onTimer);
+            Timer_.setStartInterval(5 * 60 * 1000);  // first run in 5 minutes
+            Timer_.setPeriodicInterval(AutoUpdaterFrequency_ * 1000);
+            Timer_.start(*AutoUpdaterCallBack_);
+        }
+        return 0;
+    }
+
+    void AutoUpdater::Stop() {
+        Running_ = false;
+        if(AutoUpdaterEnabled_) {
+            Timer_.stop();
+        }
+    }
+
+    void AutoUpdater::ToBeUpgraded(std::string serialNumber, std::string DeviceType) {
+        if(!AutoUpdaterEnabled_)
+            return;
+        std::lock_guard G(Mutex_);
+        Queue_.emplace_back(std::make_pair(std::move(serialNumber),std::move(DeviceType)));
+    }
+
+    void AutoUpdater::onTimer([[maybe_unused]] Poco::Timer & timer) {
+        Utils::SetThreadName("auto-updater");
+        Running_ = true;
+        std::unique_lock    L(Mutex_);
+        while(!Queue_.empty() && Running_) {
+            auto Entry = Queue_.front();
+            Queue_.pop_front();
+            try {
+                Logger().debug(fmt::format("Preparing to upgrade {}",Entry.first));
+                auto CacheEntry = Cache_.find(Entry.first);
+                uint64_t now = OpenWifi::Now();
+                std::string firmwareUpgrade;
+                if(CacheEntry == Cache_.end() || (CacheEntry->second.LastCheck-now)>300) {
+                    //  get the firmware settings for that device.
+                    SerialCache     C;
+                    C.LastCheck = now;
+                    bool        firmwareRCOnly;
+                    if(OpenWifi::SDK::Prov::GetFirmwareOptions(Entry.first, firmwareUpgrade, firmwareRCOnly)) {
+                        Logger().debug(fmt::format("Found firmware options for {}",Entry.first));
+                        C.firmwareRCOnly = firmwareRCOnly;
+                        C.firmwareUpgrade = firmwareUpgrade;
+                    } else {
+                        Logger().debug(fmt::format("Found no firmware options for {}",Entry.first));
+                        C.firmwareRCOnly = firmwareRCOnly;
+                        C.firmwareUpgrade = firmwareUpgrade;
+                    }
+                    Cache_[Entry.first] = C;
+                } else {
+
+                }
+
+                if(firmwareUpgrade=="no") {
+                    Logger().information(fmt::format("Device {} not upgradable. Provisioning service settings.",Entry.first));
+                    continue;
+                }
+
+                LatestFirmwareCacheEntry    fwEntry;
+                FMSObjects::Firmware        fwDetails;
+                auto LF = LatestFirmwareCache()->FindLatestFirmware(Entry.second, fwEntry );
+                if(LF) {
+                    if(StorageService()->FirmwaresDB().GetFirmware(fwEntry.Id,fwDetails)) {
+                        //  send the command to upgrade this device...
+                        Logger().information(fmt::format("Upgrading {} to version {}", Entry.first, fwEntry.Revision));
+                        if(OpenWifi::SDK::GW::SendFirmwareUpgradeCommand(Entry.first,fwDetails.uri)) {
+                            Logger().information(fmt::format("Upgrade command sent for {}",Entry.first));
+                        } else {
+                            Logger().information(fmt::format("Upgrade command not sent for {}",Entry.first));
+                        }
+                    } else {
+                        Logger().information(fmt::format("Firmware for device {} ({}) cannot be found.", Entry.first, Entry.second ));
+                    }
+                } else {
+                    Logger().information(fmt::format("Firmware for device {} ({}) cannot be found.", Entry.first, Entry.second ));
+                }
+            } catch (...) {
+                Logger().information(fmt::format("Exception during auto update for device {}.", Entry.first ));
+            }
+        }
+    }
+
+    void AutoUpdater::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
+        Logger().information("Reinitializing.");
+        Reset();
+    }
+}

src/AutoUpdater.h

@@ -0,0 +1,58 @@
+//
+// Created by stephane bourque on 2021-10-04.
+//
+
+#ifndef OWFMS_AUTOUPDATER_H
+#define OWFMS_AUTOUPDATER_H
+
+#include "framework/MicroService.h"
+#include <deque>
+#include "Poco/Util/Application.h"
+#include "Poco/Timer.h"
+
+namespace OpenWifi {
+
+    class AutoUpdater : public SubSystemServer { // };, Poco::Runnable {
+    public:
+
+    struct SerialCache {
+            uint64_t        LastCheck=0;
+            std::string     firmwareUpgrade;
+            bool            firmwareRCOnly=false;
+        };
+
+        static auto instance() {
+            static auto instance_ = new AutoUpdater;
+            return instance_;
+        }
+
+        int Start() override;
+        void Stop() override;
+        void ToBeUpgraded(std::string serialNumber, std::string DeviceType);
+        inline void Reset() {
+            std::lock_guard   G(Mutex_);
+            Cache_.clear();
+            Queue_.clear();
+        }
+        void reinitialize(Poco::Util::Application &self) final;
+        void onTimer(Poco::Timer & timer);
+
+    private:
+        std::atomic_bool                                    Running_=false;
+        std::map<std::string,SerialCache>                   Cache_;
+        std::deque<std::pair<std::string,std::string>>      Queue_;
+        uint64_t                                            AutoUpdaterFrequency_=600;
+        bool                                                AutoUpdaterEnabled_=true;
+        Poco::Timer                                         Timer_;
+        std::unique_ptr<Poco::TimerCallback<AutoUpdater>>   AutoUpdaterCallBack_;
+
+        explicit AutoUpdater() noexcept:
+        SubSystemServer("AutoUpdater", "AUTO-UPDATER", "autoupdater")
+            {
+            }
+    };
+
+    inline auto AutoUpdater() { return AutoUpdater::instance(); }
+}
+
+#endif //OWFMS_AUTOUPDATER_H

src/Daemon.cpp

@@ -2,8 +2,6 @@
 // Created by Stephane Bourque on 2021-05-07.
 //
 
-#include <boost/algorithm/string.hpp>
-
 #include <aws/core/Aws.h>
 #include <aws/s3/model/CreateBucketRequest.h>
 #include <aws/s3/model/PutObjectRequest.h>
@@ -11,20 +9,15 @@
 #include <aws/s3/model/PutBucketAclRequest.h>
 #include <aws/s3/model/GetBucketAclRequest.h>
 
-
-#include "Poco/Util/Application.h"
-#include "Poco/Net/SSLManager.h"
-
 #include "Daemon.h"
 #include "StorageService.h"
-#include "RESTAPI_server.h"
-#include "RESTAPI_InternalServer.h"
 #include "ManifestCreator.h"
-#include "KafkaManager.h"
 #include "NewConnectionHandler.h"
 #include "LatestFirmwareCache.h"
 #include "DeviceCache.h"
 #include "FirmwareCache.h"
+#include "AutoUpdater.h"
+#include "NewCommandHandler.h"
 
 namespace OpenWifi {
     class Daemon *Daemon::instance_ = nullptr;
@@ -36,23 +29,22 @@ namespace OpenWifi {
                                    vDAEMON_CONFIG_ENV_VAR,
                                    vDAEMON_APP_NAME,
                                    vDAEMON_BUS_TIMER,
-                                   Types::SubSystemVec{Storage(),
-                                                       FirmwareCache(),
-                                                       LatestFirmwareCache(),
-                                                       DeviceCache(),
-                                                       NewConnectionHandler(),
-                                                       RESTAPI_server(),
-                                                       RESTAPI_InternalServer(),
-                                                       ManifestCreator()
+                                   SubSystemVec{
+                                            StorageService(),
+                                            FirmwareCache(),
+                                            LatestFirmwareCache(),
+                                            DeviceCache(),
+                                            NewConnectionHandler(),
+                                            ManifestCreator(),
+                                            AutoUpdater(),
+                                            NewCommandHandler()
                                    });
         }
         return instance_;
     }
 
-    void Daemon::initialize(Poco::Util::Application &self) {
-        MicroService::initialize(*this);
+    void Daemon::PostInitialization([[maybe_unused]] Poco::Util::Application &self) {
     }
-
 }
 
 int main(int argc, char **argv) {

src/Daemon.h

@@ -2,31 +2,21 @@
 // Created by stephane bourque on 2021-05-07.
 //
 
-#include <list>
-
 #ifndef UCENTRALFWS_DAEMON_H
 #define UCENTRALFWS_DAEMON_H
 
-#include "Poco/Util/Application.h"
-#include "Poco/Util/ServerApplication.h"
-#include "Poco/ErrorHandler.h"
-#include "Poco/UUIDGenerator.h"
-#include "Poco/Crypto/RSAKey.h"
-#include "Poco/Crypto/CipherFactory.h"
-#include "Poco/Crypto/Cipher.h"
-
-#include "MicroService.h"
-#include "OpenWifiTypes.h"
-#include "RESTAPI_FMSObjects.h"
+#include "framework/MicroService.h"
+#include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_FMSObjects.h"
 #include "Dashboard.h"
 
 namespace OpenWifi {
 
-    static const char * vDAEMON_PROPERTIES_FILENAME = "owfms.properties";
-    static const char * vDAEMON_ROOT_ENV_VAR = "OWFMS_ROOT";
-    static const char * vDAEMON_CONFIG_ENV_VAR = "OWFMS_CONFIG";
-    static const char * vDAEMON_APP_NAME = uSERVICE_FIRMWARE.c_str();
-    static const uint64_t vDAEMON_BUS_TIMER = 10000;
+    [[maybe_unused]] static const char * vDAEMON_PROPERTIES_FILENAME = "owfms.properties";
+    [[maybe_unused]] static const char * vDAEMON_ROOT_ENV_VAR = "OWFMS_ROOT";
+    [[maybe_unused]] static const char * vDAEMON_CONFIG_ENV_VAR = "OWFMS_CONFIG";
+    [[maybe_unused]] static const char * vDAEMON_APP_NAME = uSERVICE_FIRMWARE.c_str();
+    [[maybe_unused]] static const uint64_t vDAEMON_BUS_TIMER = 10000;
 
     class Daemon : public MicroService {
     public:
@@ -35,10 +25,10 @@ namespace OpenWifi {
                         const std::string & ConfigEnv,
                         const std::string & AppName,
                         uint64_t 	BusTimer,
-                        const Types::SubSystemVec & SubSystems) :
+                        const SubSystemVec & SubSystems) :
                 MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
 
-        void initialize(Poco::Util::Application &self);
+        void PostInitialization(Poco::Util::Application &self);
         static Daemon *instance();
         inline void ResetDashboard() { DB_.Reset(); }
         inline void CreateDashboard() { DB_.Create(); }
@@ -50,6 +40,9 @@ namespace OpenWifi {
     };
 
     inline Daemon * Daemon() { return Daemon::instance(); }
+    inline void DaemonPostInitialization(Poco::Util::Application &self) {
+        Daemon()->PostInitialization(self);
+    }
 }
 
 #endif //UCENTRALFWS_DAEMON_H

src/Dashboard.cpp

@@ -7,11 +7,11 @@
 
 namespace OpenWifi {
 	void DeviceDashboard::Create() {
-		uint64_t Now = std::time(nullptr);
+		uint64_t Now = OpenWifi::Now();
 
 		if(LastRun_==0 || (Now-LastRun_)>120) {
 			DB_.reset();
-            Storage()->GenerateDeviceReport(DB_);
+			StorageService()->DevicesDB().GenerateDeviceReport(DB_);
 			LastRun_ = Now;
 		}
 	}

src/Dashboard.h

@@ -5,8 +5,8 @@
 #ifndef UCENTRALGW_DASHBOARD_H
 #define UCENTRALGW_DASHBOARD_H
 
-#include "OpenWifiTypes.h"
-#include "RESTAPI_FMSObjects.h"
+#include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_FMSObjects.h"
 
 namespace OpenWifi {
 	class DeviceDashboard {

src/DeviceCache.cpp

@@ -5,7 +5,6 @@
 #include "DeviceCache.h"
 
 namespace OpenWifi {
-    class DeviceCache *DeviceCache::instance_ = nullptr;
 
     int DeviceCache::Start() {
         return 0;

src/DeviceCache.h

@@ -6,8 +6,7 @@
 #define UCENTRALFMS_DEVICECACHE_H
 
 #include <string>
-#include "SubSystemServer.h"
-#include "OpenWifiTypes.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -20,10 +19,8 @@ namespace OpenWifi {
 
     class DeviceCache : public SubSystemServer {
     public:
-        static DeviceCache *instance() {
-            if (instance_ == nullptr) {
-                instance_ = new DeviceCache;
-            }
+        static auto instance() {
+            static auto instance_ = new DeviceCache;
             return instance_;
         }
 
@@ -35,7 +32,6 @@ namespace OpenWifi {
         bool GetDevice(const std::string &SerialNumber, DeviceCacheEntry & E);
 
     private:
-        static DeviceCache 	*instance_;
         std::atomic_bool    Running_=false;
         DeviceCacheMap      DeviceCache_;
         explicit DeviceCache() noexcept:
@@ -44,7 +40,7 @@ namespace OpenWifi {
         }
     };
 
-    inline DeviceCache * DeviceCache() { return DeviceCache::instance(); }
+    inline auto DeviceCache() { return DeviceCache::instance(); }
 }
 
 

src/FirmwareCache.cpp

@@ -5,7 +5,6 @@
 #include "FirmwareCache.h"
 
 namespace OpenWifi {
-    class FirmwareCache *FirmwareCache::instance_ = nullptr;
 
     int FirmwareCache::Start() {
         return 0;
@@ -15,11 +14,11 @@ namespace OpenWifi {
 
     }
 
-    std::shared_ptr<FMSObjects::Firmware> GetFirmware(const std::string & DeviceType, const std::string & Revision) {
+    std::shared_ptr<FMSObjects::Firmware> GetFirmware([[maybe_unused]] const std::string & DeviceType, [[maybe_unused]] const std::string & Revision) {
         return nullptr;
     }
 
-    std::shared_ptr<FMSObjects::Firmware> AddFirmware(const FMSObjects::Firmware &F) {
+    std::shared_ptr<FMSObjects::Firmware> AddFirmware([[maybe_unused]] const FMSObjects::Firmware &F) {
         return nullptr;
     }
 

src/FirmwareCache.h

@@ -8,8 +8,8 @@
 #include <map>
 #include <memory>
 
-#include "RESTAPI_FMSObjects.h"
-#include "SubSystemServer.h"
+#include "RESTObjects/RESTAPI_FMSObjects.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -17,10 +17,8 @@ namespace OpenWifi {
 
     class FirmwareCache: public SubSystemServer {
     public:
-        static FirmwareCache *instance() {
-            if (instance_ == nullptr) {
-                instance_ = new FirmwareCache;
-            }
+        static auto instance() {
+            static auto instance_= new FirmwareCache;
             return instance_;
         }
 
@@ -30,9 +28,7 @@ namespace OpenWifi {
         std::shared_ptr<FMSObjects::Firmware> GetFirmware(const std::string & DeviceType, const std::string & Revision);
         std::shared_ptr<FMSObjects::Firmware> AddFirmware(const FMSObjects::Firmware &F);
 
-
     private:
-        static FirmwareCache 	*instance_;
         std::atomic_bool        Running_=false;
         FirmwareCacheMap        Cache_;
         explicit FirmwareCache() noexcept:
@@ -41,7 +37,7 @@ namespace OpenWifi {
         }
     };
 
-    inline FirmwareCache * FirmwareCache() { return FirmwareCache::instance(); }
+    inline auto FirmwareCache() { return FirmwareCache::instance(); }
 
 }
 

src/KafkaManager.cpp

@@ -1,221 +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 <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

@@ -1,74 +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.
-//
-
-#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/LatestFirmwareCache.cpp

@@ -6,10 +6,9 @@
 #include "StorageService.h"
 
 namespace OpenWifi {
-    class LatestFirmwareCache *LatestFirmwareCache::instance_ = nullptr;
 
     int LatestFirmwareCache::Start() {
-        Storage()->PopulateLatestFirmwareCache();
+        StorageService()->FirmwaresDB().PopulateLatestFirmwareCache();
         return 0;
     }
 
@@ -21,14 +20,26 @@ namespace OpenWifi {
 
         RevisionSet_.insert(Revision);
         DeviceSet_.insert(DeviceType);
+
         auto E = Cache_.find(DeviceType);
         if((E==Cache_.end()) || (TimeStamp >= E->second.TimeStamp)) {
-            Cache_[DeviceType] = LatestFirmwareCacheEntry{  .Id=Id,
-                                                            .TimeStamp=TimeStamp,
-                                                            .Revision=Revision};
-            return true;
+            Cache_[DeviceType] = LatestFirmwareCacheEntry{
+                .Id=Id,
+                .TimeStamp=TimeStamp,
+                .Revision=Revision};
         }
-        return false;
+
+        if(!IsRC(Revision))
+            return true;
+
+        auto rcE = rcCache_.find(DeviceType);
+        if((rcE==rcCache_.end()) || (TimeStamp >= rcE->second.TimeStamp)) {
+            rcCache_[DeviceType] = LatestFirmwareCacheEntry{
+                .Id=Id,
+                .TimeStamp=TimeStamp,
+                .Revision=Revision};
+        }
+        return true;
     }
 
     bool LatestFirmwareCache::FindLatestFirmware(const std::string &DeviceType, LatestFirmwareCacheEntry &Entry )  {
@@ -39,10 +50,21 @@ namespace OpenWifi {
             Entry = E->second;
             return true;
         }
-
         return false;
     }
 
+    bool LatestFirmwareCache::FindLatestRCOnlyFirmware(const std::string &DeviceType, LatestFirmwareCacheEntry &Entry ) {
+        std::lock_guard G(Mutex_);
+
+        auto E=rcCache_.find(DeviceType);
+        if(E!=rcCache_.end()) {
+            Entry = E->second;
+            return true;
+        }
+        return false;
+    }
+
+
     bool LatestFirmwareCache::IsLatest(const std::string &DeviceType, const std::string &Revision) {
         std::lock_guard G(Mutex_);
 
@@ -53,6 +75,16 @@ namespace OpenWifi {
         return false;
     }
 
+    bool LatestFirmwareCache::IsLatestRCOnly(const std::string &DeviceType, const std::string &Revision) {
+        std::lock_guard G(Mutex_);
+
+        auto E=rcCache_.find(DeviceType);
+        if(E!=rcCache_.end()) {
+            return E->second.Revision==Revision;
+        }
+        return false;
+    }
+
 
     void LatestFirmwareCache::DumpCache() {
         std::lock_guard G(Mutex_);

src/LatestFirmwareCache.h

@@ -10,8 +10,8 @@
 #include "Poco/Net/HTTPServerResponse.h"
 #include "Poco/JWT/Signer.h"
 #include "Poco/SHA2Engine.h"
-#include "RESTAPI_SecurityObjects.h"
-#include "SubSystemServer.h"
+#include "RESTObjects/RESTAPI_SecurityObjects.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -21,13 +21,12 @@ namespace OpenWifi {
         std::string     Revision;
     };
     typedef std::map<std::string, LatestFirmwareCacheEntry> LatestFirmwareCacheMap;
+    typedef std::map<std::string, LatestFirmwareCacheEntry> rcOnlyLatestFirmwareCacheMap;
 
     class LatestFirmwareCache : public SubSystemServer {
     public:
-        static LatestFirmwareCache *instance() {
-            if (instance_ == nullptr) {
-                instance_ = new LatestFirmwareCache;
-            }
+        static auto instance() {
+            static auto instance_ = new LatestFirmwareCache;
             return instance_;
         }
 
@@ -36,14 +35,25 @@ namespace OpenWifi {
         bool AddToCache(const std::string & DeviceType, const std::string & Revision, const std::string &Id, uint64_t TimeStamp);
         // void AddRevision(const std::string &Revision);
         bool FindLatestFirmware(const std::string &DeviceType, LatestFirmwareCacheEntry &Entry );
+        bool FindLatestRCOnlyFirmware(const std::string &DeviceType, LatestFirmwareCacheEntry &Entry );
+
+        inline static bool IsRC(const std::string & Revision) {
+            // OpenWrt 21.02-SNAPSHOT r16399+120-c67509efd7 / TIP-v2.5.0-36b5478
+            auto Tokens = Poco::StringTokenizer(Revision,"/", Poco::StringTokenizer::TOK_TRIM);
+            if(Tokens.count()!=2)
+                return false;
+            return (Tokens[1].substr(0,5) == "IP-v");
+        }
+
         void DumpCache();
         inline Types::StringSet GetRevisions() { std::lock_guard G(Mutex_); return RevisionSet_; };
         inline Types::StringSet GetDevices() { std::lock_guard G(Mutex_); return DeviceSet_; };
         bool IsLatest(const std::string &DeviceType, const std::string &Revision);
+        bool IsLatestRCOnly(const std::string &DeviceType, const std::string &Revision);
 
     private:
-        static LatestFirmwareCache 	*instance_;
-        LatestFirmwareCacheMap      Cache_;
+        LatestFirmwareCacheMap          Cache_;
+        rcOnlyLatestFirmwareCacheMap    rcCache_;
         Types::StringSet            RevisionSet_;
         Types::StringSet            DeviceSet_;
         explicit LatestFirmwareCache() noexcept:
@@ -52,7 +62,7 @@ namespace OpenWifi {
         }
     };
 
-    inline LatestFirmwareCache * LatestFirmwareCache() { return LatestFirmwareCache::instance(); }
+    inline auto LatestFirmwareCache() { return LatestFirmwareCache::instance(); }
 }
 
 

src/ManifestCreator.cpp

@@ -6,44 +6,30 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"
 
-#include "ManifestCreator.h"
-#include "Utils.h"
-
 #include <aws/s3/model/ListObjectsRequest.h>
 #include <aws/s3/model/ListObjectsV2Request.h>
 #include <aws/s3/model/GetObjectRequest.h>
 
-#include "Daemon.h"
+#include "ManifestCreator.h"
 #include "StorageService.h"
 #include "LatestFirmwareCache.h"
 
 namespace OpenWifi {
-    class ManifestCreator *ManifestCreator::instance_ = nullptr;
 
-    void ManifestCreator::run() {
-        Running_ = true;
-        bool FirstRun = true;
-
-        while(Running_) {
-            Poco::Thread::trySleep(FirstRun ? 10000 : DBRefresh_*1000);
-            if(!Running_)
-                break;
-            FirstRun = false;
-            Logger_.information("Performing DB refresh");
-            S3BucketContent BucketList;
-            Storage()->RemoveOldFirmware();
-            ReadBucket(BucketList);
-            if(!Running_)
-                break;
-            Logger_.information(Poco::format("Found %Lu firmware entries in S3 repository.",(uint64_t)BucketList.size()));
-            ComputeManifest(BucketList);
-            AddManifestToDB(BucketList);
-        }
+    void ManifestCreator::onTimer([[maybe_unused]] Poco::Timer &timer) {
+        Utils::SetThreadName("manifest");
+        Logger().information("Performing DB refresh");
+        S3BucketContent BucketList;
+        StorageService()->FirmwaresDB().RemoveOldFirmware();
+        ReadBucket(BucketList);
+        Logger().information(fmt::format("Found {} firmware entries in S3 repository.", BucketList.size()));
+        ComputeManifest(BucketList);
+        AddManifestToDB(BucketList);
     }
 
     bool ManifestCreator::ComputeManifest(S3BucketContent &BucketContent) {
 
-        uint64_t Limit = std::time(nullptr) - MaxAge_, Rejected=0, Accepted=0, BadFormat=0, MissingJson=0;
+        uint64_t Limit = OpenWifi::Now() - MaxAge_, Rejected=0, Accepted=0, BadFormat=0, MissingJson=0;
         for(auto &[Name,Entry]:BucketContent) {
             std::string C = Entry.S3ContentManifest;
 
@@ -63,7 +49,7 @@ namespace OpenWifi {
                         Entry.Image = ParsedContent->get("image").toString();
                         auto FullNme = Name + "-upgrade.bin";
                         if(FullNme!=Entry.Image) {
-                            Logger_.error(Poco::format("MANIFEST(%s): Image name does not match manifest name (%s).",Name,Entry.Image));
+                            Logger().error(fmt::format("MANIFEST({}): Image name does not match manifest name ({}).",Name,Entry.Image));
                             Entry.Valid = false;
                             BadFormat++;
                             continue;
@@ -75,19 +61,19 @@ namespace OpenWifi {
                         Entry.Valid = false;
                     }
                 } else {
-                    Logger_.error(Poco::format("MANIFEST(%s): Entry does not have a valid JSON manifest.",Name));
+                    Logger().error(fmt::format("MANIFEST({}): Entry does not have a valid JSON manifest.",Name));
                     MissingJson++;
                     Entry.Valid = false;
                 }
             } catch (const Poco::Exception  &E ) {
-                Logger_.log(E);
+                Logger().log(E);
             }
         }
 
-        Logger_.information(Poco::format("Accepted %Lu firmwares.", Accepted));
-        Logger_.information(Poco::format("Rejected %Lu too old firmwares.", Rejected));
-        Logger_.information(Poco::format("Rejected %Lu bad JSON.", BadFormat));
-        Logger_.information(Poco::format("Rejected %Lu missing JSON.", MissingJson));
+        Logger().information(fmt::format("Accepted {} firmwares.", Accepted));
+        Logger().information(fmt::format("Rejected {} too old firmwares.", Rejected));
+        Logger().information(fmt::format("Rejected {} bad JSON.", BadFormat));
+        Logger().information(fmt::format("Rejected {} missing JSON.", MissingJson));
 
         return true;
     }
@@ -97,18 +83,23 @@ namespace OpenWifi {
         for(auto &[Release,BucketEntry]:BucketContent) {
             FMSObjects::Firmware    F;
             auto R = Release;
-            if(BucketEntry.Valid && !Storage()->GetFirmwareByName(R,BucketEntry.Compatible,F)) {
-                F.id = Daemon()->CreateUUID();
+
+            // skip staging releases.
+            if(BucketEntry.URI.find("-staging-")!=std::string::npos)
+                continue;
+
+            if(BucketEntry.Valid && !StorageService()->FirmwaresDB().GetFirmwareByName(R,BucketEntry.Compatible,F)) {
+                F.id = MicroService::instance().CreateUUID();
                 F.release = Release;
                 F.size = BucketEntry.S3Size;
-                F.created = std::time(nullptr);
+                F.created = OpenWifi::Now();
                 F.imageDate = BucketEntry.S3TimeStamp;
-                F.image = BucketEntry.S3Name;
+                F.image = BucketEntry.Image;
                 F.uri = BucketEntry.URI;
                 F.revision = BucketEntry.Revision;
                 F.deviceType = BucketEntry.Compatible;
-                if(Storage()->AddFirmware(F)) {
-                    Logger_.information(Poco::format("Adding firmware '%s'",Release));
+                if(StorageService()->FirmwaresDB().AddFirmware(F)) {
+                    Logger().information(fmt::format("Adding firmware '{}', size={}",Release,F.size));
                 } else {
                 }
             }
@@ -117,14 +108,15 @@ namespace OpenWifi {
     }
 
     int ManifestCreator::Start() {
-        S3BucketName_ = Daemon()->ConfigGetString("s3.bucketname");
-        S3Region_ = Daemon()->ConfigGetString("s3.region");
-        S3Secret_ = Daemon()->ConfigGetString("s3.secret");
-        S3Key_ = Daemon()->ConfigGetString("s3.key");
-        S3Retry_ = Daemon()->ConfigGetInt("s3.retry",60);
+        Running_ = true;
+        S3BucketName_ = MicroService::instance().ConfigGetString("s3.bucketname");
+        S3Region_ = MicroService::instance().ConfigGetString("s3.region");
+        S3Secret_ = MicroService::instance().ConfigGetString("s3.secret");
+        S3Key_ = MicroService::instance().ConfigGetString("s3.key");
+        S3Retry_ = MicroService::instance().ConfigGetInt("s3.retry",60);
 
-        DBRefresh_ = Daemon()->ConfigGetInt("firmwaredb.refresh",30*60);
-        MaxAge_ = Daemon()->ConfigGetInt("firmwaredb.maxage",90) * 24 * 60 * 60;
+        DBRefresh_ = MicroService::instance().ConfigGetInt("firmwaredb.refresh",30*60);
+        MaxAge_ = MicroService::instance().ConfigGetInt("firmwaredb.maxage",90) * 24 * 60 * 60;
 
         AwsConfig_.enableTcpKeepAlive = true;
         AwsConfig_.enableEndpointDiscovery = true;
@@ -134,23 +126,21 @@ namespace OpenWifi {
         AwsCreds_.SetAWSAccessKeyId(S3Key_);
         AwsCreds_.SetAWSSecretKey(S3Secret_);
 
-        Worker_.start(*this);
+        ManifestCreatorCallBack_ = std::make_unique<Poco::TimerCallback<ManifestCreator>>(*this, &ManifestCreator::onTimer);
+        Timer_.setStartInterval(1 * 60 * 1000);  // first run in 1 minutes
+        Timer_.setPeriodicInterval((long)(DBRefresh_ * 1000));
+        Timer_.start(*ManifestCreatorCallBack_);
+
         return 0;
     }
 
     void ManifestCreator::Stop() {
         if(Running_) {
             Running_ = false;
-            Worker_.wakeUp();
-            Worker_.join();
+            Timer_.stop();
         }
     }
 
-    bool ManifestCreator::Update() {
-        Worker_.wakeUp();
-        return true;
-    }
-
     void ManifestCreator::CloseBucket() {
     }
 
@@ -179,7 +169,7 @@ namespace OpenWifi {
         static const std::string UPGRADE("-upgrade.bin");
 
         std::string     URIBase = "https://";
-        URIBase += Daemon()->ConfigGetString("s3.bucket.uri");
+        URIBase += MicroService::instance().ConfigGetString("s3.bucket.uri");
 
         Bucket.clear();
 
@@ -195,7 +185,7 @@ namespace OpenWifi {
         while(!isDone) {
             Outcome = S3Client.ListObjectsV2(Request);
             if(!Outcome.IsSuccess()) {
-                Logger_.error(Poco::format("Error while doing ListObjectsV2: %s, %s",
+                Logger().error(fmt::format("Error while doing ListObjectsV2: {}, {}",
                                            std::string{Outcome.GetError().GetExceptionName()},
                                            std::string{Outcome.GetError().GetMessage()}));
                 return false;
@@ -234,12 +224,17 @@ namespace OpenWifi {
                                 It->second.Image = Image;
                                 It->second.S3ContentManifest = Content;
                             } else {
-                                Bucket.emplace(Release, S3BucketEntry{
+                                      Bucket.emplace(Release, S3BucketEntry{
+                                        .Valid = false,
+                                        .S3Name = "",
                                         .S3ContentManifest = Content,
+                                        .S3TimeStamp = 0 ,
+                                        .S3Size = 0 ,
                                         .Revision = Revision,
                                         .Image = Image,
                                         .Compatible = Compatible,
-                                        .Timestamp = TimeStamp});
+                                        .Timestamp = TimeStamp,
+                                        .URI = ""});
                             }
                         }
                     }
@@ -256,10 +251,17 @@ namespace OpenWifi {
                         It->second.S3Name = ReleaseName;
                         It->second.URI = URI;
                     } else {
+
                         Bucket.emplace(ReleaseName, S3BucketEntry{
-                                .S3Name = ReleaseName,
+                                .Valid = false,
+                                .S3Name = "",
+                                .S3ContentManifest = "",
                                 .S3TimeStamp = S3TimeStamp,
-                                .S3Size = S3Size,
+                                .S3Size = S3Size ,
+                                .Revision = "",
+                                .Image = "",
+                                .Compatible = "",
+                                .Timestamp = 0 ,
                                 .URI = URI});
                     }
                 } else {
@@ -279,7 +281,7 @@ namespace OpenWifi {
 
         // std::cout << "Count:" << Count << "  Runs:" << Runs << std::endl;
         if(!Outcome.IsSuccess()) {
-            Logger_.error(Poco::format("Error while doing ListObjectsV2: %s, %s",
+            Logger().error(fmt::format("Error while doing ListObjectsV2: {}, {}",
                                        std::string{Outcome.GetError().GetExceptionName()},
                                        std::string{Outcome.GetError().GetMessage()}));
             return false;

src/ManifestCreator.h

@@ -9,7 +9,8 @@
 #include <aws/s3/S3Client.h>
 #include <aws/core/auth/AWSCredentials.h>
 
-#include "SubSystemServer.h"
+#include "framework/MicroService.h"
+#include "Poco/Timer.h"
 
 namespace OpenWifi {
 
@@ -28,19 +29,15 @@ namespace OpenWifi {
     };
     typedef std::map<const std::string, S3BucketEntry>    S3BucketContent;
 
-    class ManifestCreator : public SubSystemServer, Poco::Runnable {
+    class ManifestCreator : public SubSystemServer {
     public:
-        static ManifestCreator *instance() {
-            if (instance_ == nullptr) {
-                instance_ = new ManifestCreator;
-            }
+        static auto instance() {
+            static auto instance_ = new ManifestCreator;
             return instance_;
         }
 
-        void run() override;
         int Start() override;
         void Stop() override;
-        bool Update();
 
         bool ComputeManifest(S3BucketContent & BucketContent);
         bool AddManifestToDB(S3BucketContent & BucketContent);
@@ -50,10 +47,9 @@ namespace OpenWifi {
         void CloseBucket();
         void Print(const S3BucketContent &B);
         uint64_t MaxAge() const { return MaxAge_; }
+        void onTimer(Poco::Timer & timer);
 
     private:
-        static ManifestCreator      *instance_;
-        Poco::Thread                Worker_;
         std::atomic_bool            Running_ = false;
         Aws::String                 S3BucketName_;
         Aws::String                 S3Region_;
@@ -64,13 +60,15 @@ namespace OpenWifi {
         Aws::Auth::AWSCredentials           AwsCreds_;
         uint64_t                     DBRefresh_ = 30 * 60;
         uint64_t                    MaxAge_ = 0 ;
+        Poco::Timer                                             Timer_;
+        std::unique_ptr<Poco::TimerCallback<ManifestCreator>>   ManifestCreatorCallBack_;
 
         ManifestCreator() noexcept:
                 SubSystemServer("ManifestCreator", "MANIFEST-MGR", "manifestcreator") {
         }
     };
 
-    inline ManifestCreator * ManifestCreator() { return ManifestCreator::instance(); };
+    inline auto ManifestCreator() { return ManifestCreator::instance(); };
 
 }
 

src/MicroService.cpp

@@ -1,532 +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 <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

@@ -1,183 +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.
-//
-
-#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/NewCommandHandler.cpp

@@ -0,0 +1,87 @@
+//
+// Created by stephane bourque on 2021-11-21.
+//
+
+#include "NewCommandHandler.h"
+#include "StorageService.h"
+
+namespace OpenWifi {
+
+    void NewCommandHandler::run() {
+        Running_ = true ;
+        Utils::SetThreadName("cmd-handler");
+        while(Running_) {
+            Poco::Thread::trySleep(2000);
+
+            if(!Running_)
+                break;
+
+            while(!NewCommands_.empty()) {
+                if(!Running_)
+                    break;
+
+                Types::StringPair  S;
+                {
+                    std::lock_guard G(Mutex_);
+                    S = NewCommands_.front();
+                    NewCommands_.pop();
+                }
+
+                try {
+                    auto SerialNumber = S.first;
+                    auto M = nlohmann::json::parse(S.second);
+
+                    std::string EndPoint;
+
+                    if(M.contains(uCentralProtocol::SYSTEM)) {
+                        auto SystemObj = M[uCentralProtocol::SYSTEM];
+                        if(SystemObj.contains(uCentralProtocol::HOST))
+                            EndPoint = SystemObj[uCentralProtocol::HOST];
+                    }
+
+                    if(M.contains(uCentralProtocol::PAYLOAD)) {
+                        auto PayloadSection = M[uCentralProtocol::PAYLOAD];
+                        if(PayloadSection.contains("command")) {
+                            auto Command = PayloadSection["command"];
+                            if(Command=="delete_device") {
+                                auto pSerialNumber = PayloadSection["payload"]["serialNumber"];
+                                if(pSerialNumber==SerialNumber) {
+                                    Logger().debug(fmt::format("Removing device '{}' from upgrade history.",SerialNumber));
+                                    StorageService()->HistoryDB().DeleteHistory(SerialNumber);
+                                    Logger().debug(fmt::format("Removing device '{}' from device table.",SerialNumber));
+                                    StorageService()->DevicesDB().DeleteDevice(SerialNumber);
+                                }
+                            }
+                        }
+                    }
+                } catch (const Poco::Exception &E) {
+                    Logger().log(E);
+                }
+            }
+        }
+    };
+
+    int NewCommandHandler::Start() {
+        Types::TopicNotifyFunction F = [this](std::string s1,std::string s2) { this->CommandReceived(s1,s2); };
+        WatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::COMMAND, F);
+        Worker_.start(*this);
+        return 0;
+    };
+
+    void NewCommandHandler::Stop() {
+        KafkaManager()->UnregisterTopicWatcher(KafkaTopics::COMMAND, WatcherId_);
+        Running_ = false;
+        Worker_.wakeUp();
+        Worker_.join();
+    };
+
+    bool NewCommandHandler::Update() {
+        Worker_.wakeUp();
+        return true;
+    }
+
+    void NewCommandHandler::CommandReceived( const std::string & Key, const std::string & Message) {
+        std::lock_guard G(Mutex_);
+        NewCommands_.push(std::make_pair(Key,Message));
+    }
+}

src/NewCommandHandler.h

@@ -0,0 +1,41 @@
+//
+// Created by stephane bourque on 2021-11-21.
+//
+
+#ifndef OWFMS_NEWCOMMANDHANDLER_H
+#define OWFMS_NEWCOMMANDHANDLER_H
+
+#include "framework/MicroService.h"
+#include "framework/OpenWifiTypes.h"
+
+namespace OpenWifi {
+
+    class NewCommandHandler : public SubSystemServer, Poco::Runnable {
+    public:
+        static auto instance() {
+            static auto instance_ = new NewCommandHandler;
+            return instance_;
+        }
+
+        void run() override;
+        int Start() override;
+        void Stop() override;
+        bool Update();
+        void CommandReceived( const std::string & Key, const std::string & Message);
+
+    private:
+        Poco::Thread                Worker_;
+        std::atomic_bool            Running_ = false;
+        int                         WatcherId_=0;
+        Types::StringPairQueue      NewCommands_;
+
+        NewCommandHandler() noexcept:
+            SubSystemServer("NewCommandHandler", "NEWCOM-MGR", "commanmdhandler") {
+        }
+
+    };
+    inline auto NewCommandHandler() { return NewCommandHandler::instance(); };
+
+}
+
+#endif //OWFMS_NEWCOMMANDHANDLER_H

src/NewConnectionHandler.cpp

@@ -3,26 +3,26 @@
 //
 
 #include "NewConnectionHandler.h"
-#include "Kafka_topics.h"
-#include "KafkaManager.h"
-#include "OpenWifiTypes.h"
+#include "framework/KafkaTopics.h"
+#include "framework/OpenWifiTypes.h"
+#include "framework/ow_constants.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
 #include "StorageService.h"
 #include "LatestFirmwareCache.h"
-#include "Utils.h"
-#include "uCentralProtocol.h"
 #include "DeviceCache.h"
+#include "AutoUpdater.h"
 
 /*
 { "system" : { "id" : 6715803232063 , "host" : "https://localhost:17002" } ,
  "payload" : "{"capabilities":{"compatible":"linksys_ea8300","model":"Linksys EA8300 (Dallas)","network":{"lan":["eth0"],"wan":["eth1"]},"platform":"ap","switch":{"switch0":{"enable":true,"ports":[{"device":"eth0","need_tag":false,"num":0,"want_untag":true},{"num":1,"role":"lan"},{"num":2,"role":"lan"},{"num":3,"role":"lan"},{"num":4,"role":"lan"}],"reset":true,"roles":[{"device":"eth0","ports":"1 2 3 4 0","role":"lan"}]}},"wifi":{"platform/soc/a000000.wifi":{"band":["2G"],"channels":[1,2,3,4,5,6,7,8,9,10,11],"frequencies":[2412,2417,2422,2427,2432,2437,2442,2447,2452,2457,2462],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865687986},"platform/soc/a800000.wifi":{"band":["5G"],"channels":[36,40,44,48,52,56,60,64],"frequencies":[5180,5200,5220,5240,5260,5280,5300,5320],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865687986},"soc/40000000.pci/pci0000:00/0000:00:00.0/0000:01:00.0":{"band":["5G"],"channels":[100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161,165],"frequencies":[5500,5520,5540,5560,5580,5600,5620,5640,5660,5680,5700,5720,5745,5765,5785,5805,5825],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865696178}}},"firmware":"OpenWrt 21.02-SNAPSHOT r16011+53-6fd65c6573 / TIP-devel-0825cb93","serial":"24f5a207a130","uuid":1623866223}}
  */
 
+
 namespace OpenWifi {
-    class NewConnectionHandler *NewConnectionHandler::instance_ = nullptr;
 
     void NewConnectionHandler::run() {
+        Utils::SetThreadName("conn-handler");
         Running_ = true ;
         while(Running_) {
             Poco::Thread::trySleep(2000);
@@ -65,12 +65,20 @@ namespace OpenWifi {
                                 auto Revision = Storage::TrimRevision(PayloadObj->get(uCentralProtocol::FIRMWARE).toString());
                                 // std::cout << "ConnectionEvent: SerialNumber: " << SerialNumber << " DeviceType: " << DeviceType << " Revision:" << Revision << std::endl;
                                 FMSObjects::FirmwareAgeDetails  FA;
-                                if(Storage()->ComputeFirmwareAge(DeviceType, Revision, FA)) {
-                                    Storage()->SetDeviceRevision(SerialNumber, Revision, DeviceType, EndPoint);
+                                if(StorageService()->FirmwaresDB().ComputeFirmwareAge(DeviceType, Revision, FA)) {
+                                    StorageService()->DevicesDB().SetDeviceRevision(SerialNumber, Revision, DeviceType, EndPoint);
                                     if(FA.age)
-                                        Logger_.information(Poco::format("Device %s connection. Firmware is %s older than latest",SerialNumber, Utils::SecondsToNiceText(FA.age)));
+                                        Logger().information(fmt::format("Device {} connection. Firmware is {} older than latest.",SerialNumber, Utils::SecondsToNiceText(FA.age)));
                                     else
-                                        Logger_.information(Poco::format("Device %s connection. Firmware age cannot be determined",SerialNumber));
+                                        Logger().information(fmt::format("Device {} connection. Device firmware is up to date.",SerialNumber));
+                                }
+                                else {
+                                    Logger().information(fmt::format("Device {} connection. Firmware age cannot be determined.",SerialNumber));
+                                }
+
+                                if(!LatestFirmwareCache()->IsLatest(DeviceType, Revision)) {
+                                    // std::cout << "Device (connection): " << SerialNumber << " to be upgraded ... " << std::endl;
+                                    AutoUpdater()->ToBeUpgraded(SerialNumber, DeviceType);
                                 }
                                 DeviceCache()->AddToCache(Serial, DeviceType, EndPoint, Revision);
                             }
@@ -79,7 +87,7 @@ namespace OpenWifi {
                             if(DisconnectMessage->has(uCentralProtocol::SERIALNUMBER) && DisconnectMessage->has(uCentralProtocol::TIMESTAMP)) {
                                 auto SNum = DisconnectMessage->get(uCentralProtocol::SERIALNUMBER).toString();
                                 auto Timestamp = DisconnectMessage->get(uCentralProtocol::TIMESTAMP);
-                                Storage()->SetDeviceDisconnected(SNum,EndPoint);
+                                StorageService()->DevicesDB().SetDeviceDisconnected(SNum,EndPoint);
                                 // std::cout << "DISCONNECTION:" << SerialNumber << std::endl;
                             }
                         } else if(PayloadObj->has(uCentralProtocol::PING)) {
@@ -91,13 +99,17 @@ namespace OpenWifi {
                                 auto Revision = Storage::TrimRevision(PingMessage->get(uCentralProtocol::FIRMWARE).toString());
                                 auto Serial = PingMessage->get( uCentralProtocol::SERIALNUMBER).toString();
                                 auto DeviceType = PingMessage->get( uCentralProtocol::COMPATIBLE).toString();
-                                Storage()->SetDeviceRevision(Serial, Revision, DeviceType, EndPoint);
+                                StorageService()->DevicesDB().SetDeviceRevision(Serial, Revision, DeviceType, EndPoint);
                                 DeviceCache()->AddToCache(Serial, DeviceType, EndPoint, Revision);
+                                if(!LatestFirmwareCache()->IsLatest(DeviceType, Revision)) {
+                                    // std::cout << "Device(ping): " << SerialNumber << " to be upgraded ... " << std::endl;
+                                    AutoUpdater()->ToBeUpgraded(SerialNumber, DeviceType);
+                                }
                             }
                         }
                     }
                 } catch (const Poco::Exception &E) {
-                    Logger_.log(E);
+                    Logger().log(E);
                 }
             }
         }

src/NewConnectionHandler.h

@@ -6,18 +6,16 @@
 #define UCENTRALFMS_NEWCONNECTIONHANDLER_H
 
 
-#include "SubSystemServer.h"
-#include "OpenWifiTypes.h"
+#include "framework/MicroService.h"
+#include "framework/OpenWifiTypes.h"
 
 namespace OpenWifi {
 
     class NewConnectionHandler : public SubSystemServer, Poco::Runnable {
     public:
 
-        static NewConnectionHandler *instance() {
-            if (instance_ == nullptr) {
-                instance_ = new NewConnectionHandler;
-            }
+        static auto instance() {
+            static auto instance_ = new NewConnectionHandler;
             return instance_;
         }
 
@@ -29,11 +27,9 @@ namespace OpenWifi {
         void ConnectionReceived( const std::string & Key, const std::string & Message);
 
     private:
-        static NewConnectionHandler      *instance_;
         Poco::Thread                Worker_;
         std::atomic_bool            Running_ = false;
-        int                         ConnectionWatcherId_=0;
-        int                         HealthcheckWatcherId_=0;
+        uint64_t                    ConnectionWatcherId_=0;
         Types::StringPairQueue      NewConnections_;
 
         NewConnectionHandler() noexcept:
@@ -41,7 +37,7 @@ namespace OpenWifi {
         }
 
     };
-    inline NewConnectionHandler * NewConnectionHandler() { return NewConnectionHandler::instance(); };
+    inline auto NewConnectionHandler() { return NewConnectionHandler::instance(); };
 }
 
 #endif //UCENTRALFMS_NEWCONNECTIONHANDLER_H

src/OpenAPIRequest.cpp

@@ -1,68 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-01.
-//
-#include <iostream>
-
-#include "OpenAPIRequest.h"
-
-#include "Poco/Net/HTTPSClientSession.h"
-#include <Poco/Net/HTTPClientSession.h>
-#include <Poco/Net/HTTPRequest.h>
-#include <Poco/Net/HTTPResponse.h>
-#include <Poco/StreamCopier.h>
-#include <Poco/JSON/Parser.h>
-#include <Poco/Path.h>
-#include <Poco/URI.h>
-#include <Poco/Exception.h>
-#include "Utils.h"
-#include "Daemon.h"
-
-namespace OpenWifi {
-
-	OpenAPIRequestGet::OpenAPIRequestGet( 	const std::string & ServiceType,
-											const std::string & EndPoint,
-									 		Types::StringPairVec & QueryData,
-											uint64_t msTimeout):
- 		Type_(ServiceType),
- 		EndPoint_(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

@@ -1,29 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-01.
-//
-
-#ifndef UCENTRALGW_OPENAPIREQUEST_H
-#define UCENTRALGW_OPENAPIREQUEST_H
-
-#include "Poco/JSON/Object.h"
-
-#include "OpenWifiTypes.h"
-
-namespace OpenWifi {
-
-	class OpenAPIRequestGet {
-	  public:
-		explicit OpenAPIRequestGet( const std::string & Type,
-								   	const 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

@@ -1,106 +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.
-//
-
-#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_Routers.cpp

@@ -0,0 +1,47 @@
+//
+// Created by stephane bourque on 2021-10-23.
+//
+
+#include "framework/MicroService.h"
+
+#include "RESTAPI/RESTAPI_firmwareHandler.h"
+#include "RESTAPI/RESTAPI_firmwaresHandler.h"
+#include "RESTAPI/RESTAPI_firmwareAgeHandler.h"
+#include "RESTAPI/RESTAPI_connectedDeviceHandler.h"
+#include "RESTAPI/RESTAPI_connectedDevicesHandler.h"
+#include "RESTAPI/RESTAPI_historyHandler.h"
+#include "RESTAPI/RESTAPI_deviceReportHandler.h"
+#include "RESTAPI/RESTAPI_deviceInformation_handler.h"
+
+namespace OpenWifi {
+
+    Poco::Net::HTTPRequestHandler * RESTAPI_ExtRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
+                                                            Poco::Logger & L, RESTAPI_GenericServer & S, uint64_t TransactionId) {
+        return  RESTAPI_Router<
+                RESTAPI_firmwaresHandler,
+                RESTAPI_firmwareHandler,
+                RESTAPI_system_command,
+                RESTAPI_firmwareAgeHandler,
+                RESTAPI_connectedDevicesHandler,
+                RESTAPI_connectedDeviceHandler,
+                RESTAPI_historyHandler,
+                RESTAPI_deviceReportHandler,
+                RESTAPI_deviceInformation_handler
+            >(Path,Bindings,L, S, TransactionId);
+    }
+
+    Poco::Net::HTTPRequestHandler * RESTAPI_IntRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
+                                                            Poco::Logger & L, RESTAPI_GenericServer & S, uint64_t TransactionId) {
+        return RESTAPI_Router_I<
+                RESTAPI_firmwaresHandler,
+                RESTAPI_firmwareHandler,
+                RESTAPI_system_command,
+                RESTAPI_firmwareAgeHandler,
+                RESTAPI_connectedDevicesHandler,
+                RESTAPI_connectedDeviceHandler,
+                RESTAPI_historyHandler,
+                RESTAPI_deviceReportHandler,
+                RESTAPI_deviceInformation_handler
+            >(Path, Bindings, L, S, TransactionId);
+    }
+}

src/RESTAPI/RESTAPI_connectedDeviceHandler.cpp

@@ -3,10 +3,9 @@
 //
 
 #include "RESTAPI_connectedDeviceHandler.h"
-#include "RESTAPI_FMSObjects.h"
+#include "RESTObjects/RESTAPI_FMSObjects.h"
 #include "StorageService.h"
-#include "RESTAPI_protocol.h"
-#include "RESTAPI_errors.h"
+#include "framework/ow_constants.h"
 
 namespace OpenWifi {
 
@@ -14,16 +13,14 @@ namespace OpenWifi {
         auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");
 
         if(SerialNumber.empty()) {
-            BadRequest(RESTAPI::Errors::MissingSerialNumber);
-            return;
+            return BadRequest(RESTAPI::Errors::MissingSerialNumber);
         }
 
         FMSObjects::DeviceConnectionInformation DevInfo;
-        if(Storage()->GetDevice(SerialNumber, DevInfo)) {
+        if(StorageService()->DevicesDB().GetDevice(SerialNumber, DevInfo)) {
             Poco::JSON::Object  Answer;
             DevInfo.to_json(Answer);
-            ReturnObject(Answer);
-            return;
+            return ReturnObject(Answer);
         }
         NotFound();
     }

src/RESTAPI/RESTAPI_connectedDeviceHandler.h

@@ -5,19 +5,20 @@
 #ifndef UCENTRALFMS_RESTAPI_CONNECTEDDEVICEHANDLER_H
 #define UCENTRALFMS_RESTAPI_CONNECTEDDEVICEHANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_connectedDeviceHandler : public RESTAPIHandler {
     public:
-        RESTAPI_connectedDeviceHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+        RESTAPI_connectedDeviceHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & 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 const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/connectedDevice/{serialNumber}"};}
+        static auto PathName() { return std::list<std::string>{"/api/v1/connectedDevice/{serialNumber}"};}
 
         void DoGet() final;
         void DoDelete() final {};

src/RESTAPI/RESTAPI_connectedDevicesHandler.cpp

@@ -2,27 +2,27 @@
 // Created by stephane bourque on 2021-07-18.
 //
 
-#include "RESTAPI_connectedDevicesHandler.h"
-#include "RESTAPI_FMSObjects.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Array.h"
+
+#include "RESTAPI_connectedDevicesHandler.h"
+#include "RESTObjects/RESTAPI_FMSObjects.h"
 #include "StorageService.h"
-#include "RESTAPI_protocol.h"
+#include "framework/ow_constants.h"
 
 namespace OpenWifi {
     void RESTAPI_connectedDevicesHandler::DoGet() {
         std::vector<FMSObjects::DeviceConnectionInformation> Devices;
         Poco::JSON::Object AnswerObj;
         Poco::JSON::Array AnswerArr;
-        if (Storage()->GetDevices(QB_.Offset, QB_.Limit, Devices)) {
+        if (StorageService()->DevicesDB().GetDevices(QB_.Offset, QB_.Limit, Devices)) {
             for (const auto &i:Devices) {
                 Poco::JSON::Object Obj;
                 i.to_json(Obj);
                 AnswerArr.add(Obj);
             }
             AnswerObj.set(RESTAPI::Protocol::DEVICES, AnswerArr);
-            ReturnObject(AnswerObj);
-            return;
+            return ReturnObject(AnswerObj);
         }
         AnswerObj.set(RESTAPI::Protocol::DEVICES, AnswerArr);
         ReturnObject(AnswerObj);

src/RESTAPI/RESTAPI_connectedDevicesHandler.h

@@ -6,19 +6,20 @@
 #define UCENTRALFMS_RESTAPI_CONNECTEDDEVICESHANDLER_H
 
 
-#include "RESTAPI_handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_connectedDevicesHandler : public RESTAPIHandler {
     public:
-        RESTAPI_connectedDevicesHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+        RESTAPI_connectedDevicesHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & 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 const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/connectedDevices"};}
+        static auto PathName() { return std::list<std::string>{"/api/v1/connectedDevices"};}
         void DoGet()  final;
         void DoDelete() final {};
         void DoPost() final {};

src/RESTAPI/RESTAPI_deviceInformation_handler.cpp

@@ -0,0 +1,47 @@
+//
+// Created by stephane bourque on 2022-03-04.
+//
+
+#include "RESTAPI_deviceInformation_handler.h"
+#include "StorageService.h"
+#include "LatestFirmwareCache.h"
+
+namespace OpenWifi {
+    void RESTAPI_deviceInformation_handler::DoGet() {
+        auto SerialNumber = GetBinding("serialNumber","");
+
+        if(SerialNumber.empty() || !Utils::ValidSerialNumber(SerialNumber)) {
+            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
+        }
+
+        FMSObjects::DeviceInformation   DI;
+
+        //  Let's get the history
+        StorageService()->HistoryDB().GetHistory(SerialNumber,0,100,DI.history.history);
+
+        // Let's get the DeviceConnectionInformation
+        FMSObjects::DeviceConnectionInformation DCI;
+        StorageService()->DevicesDB().GetDevice(SerialNumber,DCI);
+
+        LatestFirmwareCacheEntry    LFE;
+        LatestFirmwareCache()->FindLatestFirmware(DCI.deviceType,LFE);
+
+        FMSObjects::Firmware        Latest;
+        StorageService()->FirmwaresDB().GetFirmware(LFE.Id,Latest);
+
+        DI.serialNumber = SerialNumber;
+        DI.currentFirmware = DCI.revision;
+        DI.latestFirmware = LFE.Revision;
+        DI.latestFirmwareDate = LFE.TimeStamp;
+        DI.latestFirmwareURI = Latest.uri;
+        FirmwaresDB::RecordName FI;
+        StorageService()->FirmwaresDB().GetFirmwareByRevision(DCI.revision,DCI.deviceType,FI);
+        DI.currentFirmwareDate = FI.imageDate;
+
+        DI.latestFirmwareAvailable = (LFE.Revision != DCI.revision);
+
+        Poco::JSON::Object  Answer;
+        DI.to_json(Answer);
+        return ReturnObject(Answer);
+    }
+}

src/RESTAPI/RESTAPI_deviceInformation_handler.h

@@ -0,0 +1,26 @@
+//
+// Created by stephane bourque on 2022-03-04.
+//
+
+#pragma once
+
+#include "framework/MicroService.h"
+
+namespace OpenWifi {
+    class RESTAPI_deviceInformation_handler : public RESTAPIHandler {
+    public:
+        RESTAPI_deviceInformation_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & 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/deviceInformation/{serialNumber}"};}
+        void DoGet()  final;
+        void DoDelete() final {};
+        void DoPost() final {};
+        void DoPut() final {};
+    };
+}

src/RESTAPI/RESTAPI_deviceReportHandler.cpp

@@ -3,8 +3,7 @@
 //
 
 #include "RESTAPI_deviceReportHandler.h"
-#include "StorageService.h"
-#include "RESTAPI_FMSObjects.h"
+#include "RESTObjects/RESTAPI_FMSObjects.h"
 #include "Poco/JSON/Object.h"
 #include "Daemon.h"
 

src/RESTAPI/RESTAPI_deviceReportHandler.h

@@ -2,28 +2,25 @@
 // Created by stephane bourque on 2021-07-19.
 //
 
-#ifndef UCENTRALFMS_RESTAPI_DEVICEREPORTHANDLER_H
-#define UCENTRALFMS_RESTAPI_DEVICEREPORTHANDLER_H
+#pragma once
 
-#include "RESTAPI_handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_deviceReportHandler : public RESTAPIHandler {
     public:
-        RESTAPI_deviceReportHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+        RESTAPI_deviceReportHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & 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 const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/deviceReport"};}
+        static auto PathName() { return std::list<std::string>{"/api/v1/deviceReport"};}
         void DoGet()  final;
         void DoDelete() final {};
         void DoPost() final {};
         void DoPut() final {};
     };
 }
-
-
-#endif //UCENTRALFMS_RESTAPI_DEVICEREPORTHANDLER_H

src/RESTAPI/RESTAPI_firmwareAgeHandler.cpp

@@ -6,23 +6,18 @@
 
 #include "StorageService.h"
 #include "Poco/JSON/Parser.h"
-#include "Daemon.h"
-#include "Utils.h"
 #include "DeviceCache.h"
-#include "uCentralProtocol.h"
-#include "RESTAPI_protocol.h"
-#include "RESTAPI_errors.h"
+#include "framework/ow_constants.h"
 
 namespace OpenWifi {
     void RESTAPI_firmwareAgeHandler::DoGet() {
         if (!QB_.Select.empty()) {
             Poco::JSON::Array Objects;
-            std::vector<std::string> Numbers = Utils::Split(QB_.Select);
-            for (auto &i : Numbers) {
+            for (auto &i : SelectedRecords()) {
                 DeviceCacheEntry E;
                 if (DeviceCache()->GetDevice(i, E)) {
                     FMSObjects::FirmwareAgeDetails FA;
-                    if(Storage()->ComputeFirmwareAge(E.deviceType,E.revision,FA)) {
+                    if(StorageService()->FirmwaresDB().ComputeFirmwareAge(E.deviceType,E.revision,FA)) {
                         Poco::JSON::Object  O;
                         FA.to_json(O);
                         O.set(uCentralProtocol::SERIALNUMBER,i);
@@ -40,26 +35,23 @@ namespace OpenWifi {
             }
             Poco::JSON::Object Answer;
             Answer.set(RESTAPI::Protocol::AGES, Objects);
-            ReturnObject(Answer);
-            return;
+            return ReturnObject(Answer);
         } else {
             auto DeviceType = GetParameter(RESTAPI::Protocol::DEVICETYPE, "");
             auto Revision = GetParameter(RESTAPI::Protocol::REVISION, "");
 
             if (DeviceType.empty() || Revision.empty()) {
-                BadRequest(RESTAPI::Errors::BothDeviceTypeRevision);
-                return;
+                return BadRequest(RESTAPI::Errors::BothDeviceTypeRevision);
             }
 
             Revision = Storage::TrimRevision(Revision);
 
             FMSObjects::FirmwareAgeDetails FA;
-            if (Storage()->ComputeFirmwareAge(DeviceType, Revision, FA)) {
+            if (StorageService()->FirmwaresDB().ComputeFirmwareAge(DeviceType, Revision, FA)) {
                 Poco::JSON::Object Answer;
 
                 FA.to_json(Answer);
-                ReturnObject(Answer);
-                return;
+                return ReturnObject(Answer);
             }
             NotFound();
         }

src/RESTAPI/RESTAPI_firmwareAgeHandler.h

@@ -5,19 +5,20 @@
 #ifndef UCENTRALFMS_RESTAPI_FIRMWAREAGEHANDLER_H
 #define UCENTRALFMS_RESTAPI_FIRMWAREAGEHANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_firmwareAgeHandler : public RESTAPIHandler {
     public:
-        RESTAPI_firmwareAgeHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+        RESTAPI_firmwareAgeHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & 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 const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmwareAge"};}
+        static auto PathName() { return std::list<std::string>{"/api/v1/firmwareAge"};}
         void DoGet()  final;
         void DoDelete() final {};
         void DoPost() final {};

src/RESTAPI/RESTAPI_firmwareHandler.cpp

@@ -6,27 +6,21 @@
 
 #include "RESTAPI_firmwareHandler.h"
 #include "StorageService.h"
-#include "Daemon.h"
-#include "uCentralProtocol.h"
-#include "RESTAPI_protocol.h"
-#include "RESTAPI_utils.h"
-#include "RESTAPI_errors.h"
+#include "framework/ow_constants.h"
 
 namespace OpenWifi {
     void
     RESTAPI_firmwareHandler::DoPost() {
-        auto Obj = ParseStream();
+        const auto &Obj = ParsedBody_;
         FMSObjects::Firmware F;
         if (!F.from_json(Obj)) {
-            BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-            return;
+            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
         }
-        F.id = Daemon()->CreateUUID();
-        if(Storage()->AddFirmware(F)) {
+        F.id = MicroService::instance().CreateUUID();
+        if(StorageService()->FirmwaresDB().AddFirmware(F)) {
             Poco::JSON::Object  Answer;
             F.to_json(Answer);
-            ReturnObject(Answer);
-            return;
+            return ReturnObject(Answer);
         }
         BadRequest(RESTAPI::Errors::RecordNotCreated);
     }
@@ -36,16 +30,14 @@ namespace OpenWifi {
         auto UUID = GetBinding(uCentralProtocol::ID, "");
 
         if(UUID.empty()) {
-            BadRequest(RESTAPI::Errors::MissingUUID);
-            return;
+            return BadRequest(RESTAPI::Errors::MissingUUID);
         }
 
         FMSObjects::Firmware F;
-        if (Storage()->GetFirmware(UUID, F)) {
+        if (StorageService()->FirmwaresDB().GetFirmware(UUID, F)) {
             Poco::JSON::Object Object;
             F.to_json(Object);
-            ReturnObject(Object);
-            return;
+            return ReturnObject(Object);
         }
         NotFound();
     }
@@ -54,13 +46,11 @@ namespace OpenWifi {
     RESTAPI_firmwareHandler::DoDelete() {
         auto UUID = GetBinding(uCentralProtocol::ID, "");
         if(UUID.empty()) {
-            BadRequest(RESTAPI::Errors::MissingUUID);
-            return;
+            return BadRequest(RESTAPI::Errors::MissingUUID);
         }
 
-        if (Storage()->DeleteFirmware(UUID)) {
-            OK();
-            return;
+        if (StorageService()->FirmwaresDB().DeleteFirmware(UUID)) {
+            return OK();
         }
         BadRequest(RESTAPI::Errors::CouldNotBeDeleted);
     }
@@ -68,21 +58,18 @@ namespace OpenWifi {
     void RESTAPI_firmwareHandler::DoPut() {
         auto UUID = GetBinding(uCentralProtocol::ID, "");
         if(UUID.empty()) {
-            BadRequest(RESTAPI::Errors::MissingUUID);
-            return;
+            return BadRequest(RESTAPI::Errors::MissingUUID);
         }
 
         FMSObjects::Firmware    F;
-        if(!Storage()->GetFirmware(UUID, F)) {
-            NotFound();
-            return;
+        if(!StorageService()->FirmwaresDB().GetFirmware(UUID, F)) {
+            return NotFound();
         }
 
-        auto Obj = ParseStream();
+        const auto & Obj = ParsedBody_;
         FMSObjects::Firmware    NewFirmware;
         if(!NewFirmware.from_json(Obj)) {
-            BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-            return;
+            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
         }
 
         if(Obj->has(RESTAPI::Protocol::DESCRIPTION))
@@ -91,16 +78,15 @@ namespace OpenWifi {
             SecurityObjects::NoteInfoVec NIV;
             NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get(RESTAPI::Protocol::NOTES).toString());
             for(auto const &i:NIV) {
-                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UserInfo_.userinfo.email, .note=i.note};
+                SecurityObjects::NoteInfo   ii{.created=(uint64_t)OpenWifi::Now(), .createdBy=UserInfo_.userinfo.email, .note=i.note};
                 F.notes.push_back(ii);
             }
         }
 
-        if(Storage()->UpdateFirmware(UUID, F)) {
+        if(StorageService()->FirmwaresDB().UpdateFirmware(UUID, F)) {
             Poco::JSON::Object  Answer;
             F.to_json(Answer);
-            ReturnObject(Answer);
-            return;
+            return ReturnObject(Answer);
         }
         BadRequest(RESTAPI::Errors::RecordNotUpdated);
     }

src/RESTAPI/RESTAPI_firmwareHandler.h

@@ -5,12 +5,12 @@
 #ifndef UCENTRALFWS_RESTAPI_FIRMWAREHANDLER_H
 #define UCENTRALFWS_RESTAPI_FIRMWAREHANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_firmwareHandler : public RESTAPIHandler {
     public:
-        RESTAPI_firmwareHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+        RESTAPI_firmwareHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
                 : RESTAPIHandler(bindings, L,
                                  std::vector<std::string>
                                          {Poco::Net::HTTPRequest::HTTP_GET,
@@ -19,8 +19,9 @@ namespace OpenWifi {
                                           Poco::Net::HTTPRequest::HTTP_DELETE,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
                                           Server,
+                                          TransactionId,
                                           Internal) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmware/{id}"};}
+        static auto PathName() { return std::list<std::string>{"/api/v1/firmware/{id}"};}
         void DoGet()  final;
         void DoDelete() final;
         void DoPost() final;

src/RESTAPI/RESTAPI_firmwaresHandler.cpp

@@ -5,18 +5,17 @@
 #include "RESTAPI_firmwaresHandler.h"
 #include "StorageService.h"
 #include "LatestFirmwareCache.h"
-#include "RESTAPI_protocol.h"
+#include "framework/ow_constants.h"
 
 namespace OpenWifi {
     void
     RESTAPI_firmwaresHandler::DoGet() {
         std::string DeviceType = GetParameter(RESTAPI::Protocol::DEVICETYPE, "");
-        bool IdOnly = GetBoolParameter(RESTAPI::Protocol::IDONLY, false);
-        bool RevisionSet = GetBoolParameter(RESTAPI::Protocol::REVISIONSET, false);
-        bool LatestOnly = GetBoolParameter(RESTAPI::Protocol::LATESTONLY, false);
-        bool DeviceSet = GetBoolParameter(RESTAPI::Protocol::DEVICESET, false);
+        bool IdOnly = GetBoolParameter(RESTAPI::Protocol::IDONLY);
+        bool LatestOnly = GetBoolParameter(RESTAPI::Protocol::LATESTONLY);
+        bool rcOnly = GetBoolParameter("rcOnly");
 
-        if(DeviceSet) {
+        if(GetBoolParameter(RESTAPI::Protocol::DEVICESET)) {
             auto Revisions = LatestFirmwareCache()->GetDevices();
             Poco::JSON::Array ObjectArray;
             for (const auto &i:Revisions) {
@@ -24,11 +23,10 @@ namespace OpenWifi {
             }
             Poco::JSON::Object RetObj;
             RetObj.set(RESTAPI::Protocol::DEVICETYPES, ObjectArray);
-            ReturnObject(RetObj);
-            return;
+            return ReturnObject(RetObj);
         }
 
-        if(RevisionSet) {
+        if(GetBoolParameter(RESTAPI::Protocol::REVISIONSET)) {
             auto Revisions = LatestFirmwareCache()->GetRevisions();
             Poco::JSON::Array ObjectArray;
             for (const auto &i:Revisions) {
@@ -36,33 +34,37 @@ namespace OpenWifi {
             }
             Poco::JSON::Object RetObj;
             RetObj.set(RESTAPI::Protocol::REVISIONS, ObjectArray);
-            ReturnObject(RetObj);
-            return;
+            return ReturnObject(RetObj);
         }
 
         // special cases: if latestOnly and deviceType
         if(!DeviceType.empty()) {
             if(LatestOnly) {
                 LatestFirmwareCacheEntry    Entry;
-                if(!LatestFirmwareCache()->FindLatestFirmware(DeviceType,Entry)) {
-                    NotFound();
-                    return;
+                if(rcOnly) {
+                    if (!LatestFirmwareCache()->FindLatestRCOnlyFirmware(DeviceType, Entry)) {
+                        return NotFound();
+                    }
+                } else {
+                    if (!LatestFirmwareCache()->FindLatestFirmware(DeviceType, Entry)) {
+                        return NotFound();
+                    }
                 }
 
                 FMSObjects::Firmware    F;
-                if(Storage()->GetFirmware(Entry.Id,F)) {
+                if(StorageService()->FirmwaresDB().GetFirmware(Entry.Id,F)) {
                     Poco::JSON::Object  Answer;
                     F.to_json(Answer);
-                    ReturnObject(Answer);
-                    return;
+                    return ReturnObject(Answer);
                 }
-                NotFound();
-                return;
+                return NotFound();
             } else {
                 std::vector<FMSObjects::Firmware> List;
-                if (Storage()->GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
+                if (StorageService()->FirmwaresDB().GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
                     Poco::JSON::Array ObjectArray;
                     for (const auto &i:List) {
+                        if(rcOnly && !LatestFirmwareCache::IsRC(i.revision))
+                            continue;
                         if(IdOnly) {
                             ObjectArray.add(i.id);
                         } else {
@@ -73,11 +75,9 @@ namespace OpenWifi {
                     }
                     Poco::JSON::Object RetObj;
                     RetObj.set(RESTAPI::Protocol::FIRMWARES, ObjectArray);
-                    ReturnObject(RetObj);
-                    return;
+                    return ReturnObject(RetObj);
                 } else {
-                    NotFound();
-                    return;
+                    return NotFound();
                 }
             }
         }
@@ -85,8 +85,10 @@ namespace OpenWifi {
         std::vector<FMSObjects::Firmware> List;
         Poco::JSON::Array ObjectArray;
         Poco::JSON::Object Answer;
-        if (Storage()->GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
+        if (StorageService()->FirmwaresDB().GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
             for (const auto &i:List) {
+                if(rcOnly && !LatestFirmwareCache::IsRC(i.revision))
+                    continue;
                 if(IdOnly) {
                     ObjectArray.add(i.id);
                 } else {

src/RESTAPI/RESTAPI_firmwaresHandler.h

@@ -5,20 +5,21 @@
 #ifndef UCENTRALFWS_RESTAPI_FIRMWARESHANDLER_H
 #define UCENTRALFWS_RESTAPI_FIRMWARESHANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_firmwaresHandler : public RESTAPIHandler {
     public:
-        RESTAPI_firmwaresHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+        RESTAPI_firmwaresHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & 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 const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmwares"};}
+        static auto PathName() { return std::list<std::string>{"/api/v1/firmwares"};}
         void DoGet()  final;
         void DoDelete() final {};
         void DoPost() final {};

src/RESTAPI/RESTAPI_historyHandler.cpp

@@ -0,0 +1,65 @@
+//
+// Created by stephane bourque on 2021-07-13.
+//
+
+#include "RESTAPI_historyHandler.h"
+#include "StorageService.h"
+#include "framework/ow_constants.h"
+
+namespace OpenWifi {
+    void
+    RESTAPI_historyHandler::DoGet() {
+        auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
+
+        if(SerialNumber.empty()) {
+            return BadRequest(RESTAPI::Errors::MissingSerialNumber);
+        }
+
+        auto unknownList = GetBoolParameter("unknownList");
+        if(SerialNumber=="000000000000" && unknownList) {
+            // so let's get all the devices, filter the latest record
+            FMSObjects::DeviceCurrentInfoList   L;
+            StorageService()->HistoryDB().GetUnknownDeviceFirmwares(QB_.Offset,QB_.Limit,L.devices);
+            Poco::JSON::Object  Answer;
+            L.to_json(Answer);
+            return ReturnObject(Answer);
+        }
+
+        auto currentList = GetBoolParameter("currentList");
+        if(SerialNumber=="000000000000" && currentList) {
+            // so let's get all the devices, filter the latest record
+            FMSObjects::DeviceCurrentInfoList   L;
+            StorageService()->HistoryDB().GetDeviceFirmwares(QB_.Offset,QB_.Limit,L.devices);
+            Poco::JSON::Object  Answer;
+            L.to_json(Answer);
+            return ReturnObject(Answer);
+        }
+
+        FMSObjects::RevisionHistoryEntryVec H;
+        if (StorageService()->HistoryDB().GetHistory(SerialNumber, QB_.Offset, QB_.Limit, H)) {
+            Poco::JSON::Array A;
+            for (auto const &i:H) {
+                Poco::JSON::Object O;
+                i.to_json(O);
+                A.add(O);
+            }
+            Poco::JSON::Object Answer;
+            Answer.set(RESTAPI::Protocol::HISTORY, A);
+            return ReturnObject(Answer);
+        }
+        NotFound();
+    }
+
+    void RESTAPI_historyHandler::DoDelete() {
+        auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
+        auto Id = GetParameter(RESTAPI::Protocol::ID, "");
+        if (SerialNumber.empty() || Id.empty()) {
+            return BadRequest(RESTAPI::Errors::IdOrSerialEmpty);
+        }
+
+        if (!StorageService()->HistoryDB().DeleteHistory(SerialNumber, Id)) {
+            return OK();
+        }
+        NotFound();
+    }
+}

src/RESTAPI/RESTAPI_historyHandler.h

@@ -2,30 +2,26 @@
 // Created by stephane bourque on 2021-07-13.
 //
 
-#ifndef UCENTRALFMS_RESTAPI_HISTORYHANDLER_H
-#define UCENTRALFMS_RESTAPI_HISTORYHANDLER_H
+#pragma once
 
-
-#include "RESTAPI_handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_historyHandler : public RESTAPIHandler {
     public:
-        RESTAPI_historyHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+        RESTAPI_historyHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
                 : RESTAPIHandler(bindings, L,
                                  std::vector<std::string>
                                          {Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_DELETE,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
                                           Server,
+                                          TransactionId,
                                           Internal) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/revisionHistory/{serialNumber}"};}
+        static auto PathName() { return std::list<std::string>{"/api/v1/revisionHistory/{serialNumber}"};}
         void DoGet()  final;
         void DoDelete() final;
         void DoPost() final {};
         void DoPut() final {};
     };
 }
-
-
-#endif //UCENTRALFMS_RESTAPI_HISTORYHANDLER_H

src/RESTAPI_GenericServer.cpp

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

src/RESTAPI_GenericServer.h

@@ -1,78 +0,0 @@
-//
-// 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

@@ -1,79 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-29.
-//
-
-#include "RESTAPI_InternalServer.h"
-
-#include "Poco/URI.h"
-
-#include "RESTAPI_firmwareHandler.h"
-#include "RESTAPI_firmwaresHandler.h"
-#include "RESTAPI_system_command.h"
-#include "RESTAPI_connectedDevicesHandler.h"
-#include "RESTAPI_connectedDeviceHandler.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_firmwaresHandler,
-                RESTAPI_firmwareHandler,
-                RESTAPI_system_command,
-                RESTAPI_connectedDevicesHandler,
-                RESTAPI_connectedDeviceHandler
-        >(Path, Bindings, Logger_, Server_);
-    }
-
-}

src/RESTAPI_InternalServer.h

@@ -1,58 +0,0 @@
-//
-// 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:
-        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.h

@@ -1,181 +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.
-//
-
-#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_errors.h

@@ -1,55 +0,0 @@
-//
-// Created by stephane bourque on 2021-09-12.
-//
-
-#ifndef OWPROV_RESTAPI_ERRORS_H
-#define OWPROV_RESTAPI_ERRORS_H
-
-namespace OpenWifi::RESTAPI::Errors {
-    static const std::string MissingUUID{"Missing UUID."};
-    static const std::string MissingSerialNumber{"Missing Serial Number."};
-    static const std::string InternalError{"Internal error. Please try later."};
-    static const std::string InvalidJSONDocument{"Invalid JSON document."};
-    static const std::string UnsupportedHTTPMethod{"Unsupported HTTP Method"};
-    static const std::string StillInUse{"Element still in use."};
-    static const std::string CouldNotBeDeleted{"Element could not be deleted."};
-    static const std::string NameMustBeSet{"The name property must be set."};
-    static const std::string ConfigBlockInvalid{"Configuration block type invalid."};
-    static const std::string UnknownId{"Unknown management policy."};
-    static const std::string InvalidDeviceTypes{"Unknown or invalid device type(s)."};
-    static const std::string RecordNotCreated{"Record could not be created."};
-    static const std::string RecordNotUpdated{"Record could not be updated."};
-    static const std::string UnknownManagementPolicyUUID{"Unknown management policy UUID."};
-    static const std::string CannotDeleteRoot{"Root Entity cannot be removed, only modified."};
-    static const std::string MustCreateRootFirst{"Root entity must be created first."};
-    static const std::string ParentUUIDMustExist{"Parent UUID must exist."};
-    static const std::string ConfigurationMustExist{"Configuration must exist."};
-    static const std::string MissingOrInvalidParameters{"Invalid or missing parameters."};
-    static const std::string UnknownSerialNumber{"Unknown Serial Number."};
-    static const std::string InvalidSerialNumber{"Invalid Serial Number."};
-    static const std::string SerialNumberExists{"Serial Number already exists."};
-    static const std::string ValidNonRootUUID{"Must be a non-root, and valid UUID."};
-    static const std::string VenueMustExist{"Venue does not exist."};
-    static const std::string NotBoth{"You cannot specify both Entity and Venue"};
-    static const std::string EntityMustExist{"Entity must exist."};
-    static const std::string ParentOrEntityMustBeSet{"Parent or Entity must be set."};
-    static const std::string ContactMustExist{"Contact must exist."};
-    static const std::string LocationMustExist{"Location must exist."};
-    static const std::string OnlyWSSupported{"This endpoint only supports WebSocket."};
-    static const std::string SerialNumberMismatch{"Serial Number mismatch."};
-    static const std::string InvalidCommand{"Invalid command."};
-    static const std::string NoRecordsDeleted{"No records deleted."};
-    static const std::string DeviceNotConnected{"Device is not currently connected."};
-    static const std::string CannotCreateWS{"Telemetry system could not create WS endpoint. Please try again."};
-    static const std::string BothDeviceTypeRevision{"Both deviceType and revision must be set."};
-    static const std::string IdOrSerialEmpty{"SerialNumber and Id must not be empty."};
-    static const std::string MissingUserID{"Missing user ID."};
-    static const std::string IdMustBe0{"To create a user, you must set the ID to 0"};
-    static const std::string InvalidUserRole{"Invalid userRole."};
-    static const std::string InvalidEmailAddress{"Invalid email address."};
-    static const std::string InvalidPassword{"Invalid password."};
-    static const std::string PasswordRejected{"Password was rejected. This maybe an old password."};
-    static const std::string InvalidIPRanges{"Invalid IP range specifications."};
-}
-
-#endif //OWPROV_RESTAPI_ERRORS_H

src/RESTAPI_handler.cpp

@@ -1,479 +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 <cctype>
-#include <algorithm>
-#include <functional>
-#include <iostream>
-#include <iterator>
-#include <future>
-#include <chrono>
-
-#include "Poco/URI.h"
-#include "Poco/Net/OAuth20Credentials.h"
-
-#include "RESTAPI_errors.h"
-
-#ifdef	TIP_SECURITY_SERVICE
-#include "AuthService.h"
-#else
-#include "AuthClient.h"
-#endif
-
-#include "RESTAPI_handler.h"
-#include "RESTAPI_protocol.h"
-#include "Utils.h"
-#include "Daemon.h"
-
-namespace OpenWifi {
-
-    void RESTAPIHandler::handleRequest(Poco::Net::HTTPServerRequest &RequestIn,
-                       Poco::Net::HTTPServerResponse &ResponseIn) {
-		try {
-			Request = &RequestIn;
-			Response = &ResponseIn;
-
-			if (!ContinueProcessing())
-				return;
-
-			if (AlwaysAuthorize_ && !IsAuthorized())
-				return;
-
-			ParseParameters();
-			if (Request->getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
-				DoGet();
-			else if (Request->getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
-				DoPost();
-			else if (Request->getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE)
-				DoDelete();
-			else if (Request->getMethod() == Poco::Net::HTTPRequest::HTTP_PUT)
-				DoPut();
-			else
-				BadRequest(RESTAPI::Errors::UnsupportedHTTPMethod);
-			return;
-		} catch (const Poco::Exception &E) {
-			Logger_.log(E);
-			BadRequest(RESTAPI::Errors::InternalError);
-		}
-	}
-
-    const Poco::JSON::Object::Ptr &RESTAPIHandler::ParseStream() {
-        return IncomingParser_.parse(Request->stream()).extract<Poco::JSON::Object::Ptr>();
-    }
-
-	bool RESTAPIHandler::ParseBindings(const std::string & Request, const std::list<const char *> & EndPoints, BindingMap &bindings) {
-		bindings.clear();
-		std::vector<std::string> PathItems = Utils::Split(Request, '/');
-
-		for(const auto &EndPoint:EndPoints) {
-			std::vector<std::string> ParamItems = Utils::Split(EndPoint, '/');
-			if (PathItems.size() != ParamItems.size())
-				continue;
-
-			bool Matched = true;
-			for (auto i = 0; i != PathItems.size() && Matched; i++) {
-				if (PathItems[i] != ParamItems[i]) {
-					if (ParamItems[i][0] == '{') {
-						auto ParamName = ParamItems[i].substr(1, ParamItems[i].size() - 2);
-						bindings[Poco::toLower(ParamName)] = PathItems[i];
-					} else {
-						Matched = false;
-					}
-				}
-			}
-			if(Matched)
-				return true;
-		}
-		return false;
-	}
-
-	void RESTAPIHandler::PrintBindings() {
-		for (const auto &[key, value] : Bindings_)
-			std::cout << "Key = " << key << "  Value= " << value << std::endl;
-	}
-
-	void RESTAPIHandler::ParseParameters() {
-		Poco::URI uri(Request->getURI());
-		Parameters_ = uri.getQueryParameters();
-		InitQueryBlock();
-	}
-
-	static bool is_number(const std::string &s) {
-		return !s.empty() && std::all_of(s.begin(), s.end(), ::isdigit);
-	}
-
-	static bool is_bool(const std::string &s) {
-		if (s == "true" || s == "false")
-			return true;
-		return false;
-	}
-
-	uint64_t RESTAPIHandler::GetParameter(const std::string &Name, const uint64_t Default) {
-        auto Hint = std::find_if(Parameters_.begin(),Parameters_.end(),[Name](const std::pair<std::string,std::string> &S){ return S.first==Name; });
-        if(Hint==Parameters_.end() || !is_number(Hint->second))
-            return Default;
-        return std::stoull(Hint->second);
-	}
-
-	bool RESTAPIHandler::GetBoolParameter(const std::string &Name, bool Default) {
-        auto Hint = std::find_if(begin(Parameters_),end(Parameters_),[Name](const std::pair<std::string,std::string> &S){ return S.first==Name; });
-        if(Hint==end(Parameters_) || !is_bool(Hint->second))
-            return Default;
-		return Hint->second=="true";
-	}
-
-	std::string RESTAPIHandler::GetParameter(const std::string &Name, const std::string &Default) {
-        auto Hint = std::find_if(begin(Parameters_),end(Parameters_),[Name](const std::pair<std::string,std::string> &S){ return S.first==Name; });
-        if(Hint==end(Parameters_))
-            return Default;
-        return Hint->second;
-	}
-
-	bool RESTAPIHandler::HasParameter(const std::string &Name, std::string &Value) {
-        auto Hint = std::find_if(begin(Parameters_),end(Parameters_),[Name](const std::pair<std::string,std::string> &S){ return S.first==Name; });
-        if(Hint==end(Parameters_))
-            return false;
-        Value = Hint->second;
-        return true;
-	}
-
-	bool RESTAPIHandler::HasParameter(const std::string &Name, uint64_t & Value) {
-        auto Hint = std::find_if(begin(Parameters_),end(Parameters_),[Name](const std::pair<std::string,std::string> &S){ return S.first==Name; });
-        if(Hint==end(Parameters_))
-            return false;
-        Value = std::stoull(Hint->second);
-        return true;
-	}
-
-	const std::string &RESTAPIHandler::GetBinding(const std::string &Name, const std::string &Default) {
-		auto E = Bindings_.find(Poco::toLower(Name));
-		if (E == Bindings_.end())
-			return Default;
-
-		return E->second;
-	}
-
-	static std::string MakeList(const std::vector<std::string> &L) {
-		std::string Return;
-		for (const auto &i : L)
-			if (Return.empty())
-				Return = i;
-			else
-				Return += ", " + i;
-
-		return Return;
-	}
-
-	bool RESTAPIHandler::AssignIfPresent(const Poco::JSON::Object::Ptr &O, const std::string &Field, std::string &Value) {
-	    if(O->has(Field)) {
-	        Value = O->get(Field).toString();
-	        return true;
-	    }
-	    return false;
-	}
-
-	bool RESTAPIHandler::AssignIfPresent(const Poco::JSON::Object::Ptr &O, const std::string &Field, uint64_t &Value) {
-	    if(O->has(Field)) {
-	        Value = O->get(Field);
-	        return true;
-	    }
-	    return false;
-	}
-
-	void RESTAPIHandler::AddCORS() {
-		auto Origin = Request->find("Origin");
-		if (Origin != Request->end()) {
-			Response->set("Access-Control-Allow-Origin", Origin->second);
-			Response->set("Vary", "Origin");
-		} else {
-			Response->set("Access-Control-Allow-Origin", "*");
-		}
-		Response->set("Access-Control-Allow-Headers", "*");
-		Response->set("Access-Control-Allow-Methods", MakeList(Methods_));
-		Response->set("Access-Control-Max-Age", "86400");
-	}
-
-	void RESTAPIHandler::SetCommonHeaders(bool CloseConnection) {
-		Response->setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
-		Response->setChunkedTransferEncoding(true);
-		Response->setContentType("application/json");
-		if(CloseConnection) {
-			Response->set("Connection", "close");
-			Response->setKeepAlive(false);
-		} else {
-			Response->setKeepAlive(true);
-			Response->set("Connection", "Keep-Alive");
-			Response->set("Keep-Alive", "timeout=5, max=1000");
-		}
-	}
-
-	void RESTAPIHandler::ProcessOptions() {
-		AddCORS();
-		SetCommonHeaders();
-		Response->setContentLength(0);
-		Response->set("Access-Control-Allow-Credentials", "true");
-		Response->setStatus(Poco::Net::HTTPResponse::HTTP_OK);
-		Response->set("Vary", "Origin, Access-Control-Request-Headers, Access-Control-Request-Method");
-		Response->send();
-	}
-
-	void RESTAPIHandler::PrepareResponse( Poco::Net::HTTPResponse::HTTPStatus Status,
-										 bool CloseConnection) {
-		Response->setStatus(Status);
-		AddCORS();
-		SetCommonHeaders(CloseConnection);
-	}
-
-	void RESTAPIHandler::BadRequest(const std::string & Reason) {
-		PrepareResponse(Poco::Net::HTTPResponse::HTTP_BAD_REQUEST);
-		Poco::JSON::Object	ErrorObject;
-		ErrorObject.set("ErrorCode",400);
-		ErrorObject.set("ErrorDetails",Request->getMethod());
-		ErrorObject.set("ErrorDescription",Reason.empty() ? "Command is missing parameters or wrong values." : Reason) ;
-		std::ostream &Answer = Response->send();
-		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
-	}
-
-	void RESTAPIHandler::InternalError(const std::string & Reason) {
-        PrepareResponse(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
-        Poco::JSON::Object	ErrorObject;
-        ErrorObject.set("ErrorCode",500);
-        ErrorObject.set("ErrorDetails",Request->getMethod());
-        ErrorObject.set("ErrorDescription",Reason.empty() ? "Please try later or review the data submitted." : Reason) ;
-        std::ostream &Answer = Response->send();
-        Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
-    }
-
-	void RESTAPIHandler::UnAuthorized(const std::string & Reason) {
-		PrepareResponse(Poco::Net::HTTPResponse::HTTP_FORBIDDEN);
-		Poco::JSON::Object	ErrorObject;
-		ErrorObject.set("ErrorCode",403);
-		ErrorObject.set("ErrorDetails",Request->getMethod());
-		ErrorObject.set("ErrorDescription",Reason.empty() ? "No access allowed." : Reason) ;
-		std::ostream &Answer = Response->send();
-		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
-	}
-
-	void RESTAPIHandler::NotFound() {
-		PrepareResponse(Poco::Net::HTTPResponse::HTTP_NOT_FOUND);
-		Poco::JSON::Object	ErrorObject;
-		ErrorObject.set("ErrorCode",404);
-		ErrorObject.set("ErrorDetails",Request->getMethod());
-		ErrorObject.set("ErrorDescription","This resource does not exist.");
-		std::ostream &Answer = Response->send();
-		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
-		Logger_.debug(Poco::format("RES-NOTFOUND: User='%s' Method='%s' Path='%s",
-                                   Utils::FormatIPv6(Request->clientAddress().toString()),
-                                   Request->getMethod(),
-                                   Request->getURI()));
-	}
-
-	void RESTAPIHandler::OK() {
-		PrepareResponse();
-		if(	Request->getMethod()==Poco::Net::HTTPRequest::HTTP_DELETE ||
-			Request->getMethod()==Poco::Net::HTTPRequest::HTTP_OPTIONS) {
-			Response->send();
-		} else {
-			Poco::JSON::Object ErrorObject;
-			ErrorObject.set("Code", 0);
-			ErrorObject.set("Operation", Request->getMethod());
-			ErrorObject.set("Details", "Command completed.");
-			std::ostream &Answer = Response->send();
-			Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
-		}
-	}
-
-	void RESTAPIHandler::SendFile(Poco::File & File, const std::string & UUID) {
-		Response->set("Content-Type","application/octet-stream");
-		Response->set("Content-Disposition", "attachment; filename=" + UUID );
-		Response->set("Content-Transfer-Encoding","binary");
-		Response->set("Accept-Ranges", "bytes");
-		Response->set("Cache-Control", "private");
-		Response->set("Pragma", "private");
-		Response->set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
-		Response->set("Content-Length", std::to_string(File.getSize()));
-		AddCORS();
-		Response->sendFile(File.path(),"application/octet-stream");
-	}
-
-    void RESTAPIHandler::SendFile(Poco::File & File) {
-        Poco::Path  P(File.path());
-        auto MT = Utils::FindMediaType(File);
-        if(MT.Encoding==Utils::BINARY) {
-            Response->set("Content-Transfer-Encoding","binary");
-            Response->set("Accept-Ranges", "bytes");
-        }
-        Response->set("Cache-Control", "private");
-        Response->set("Pragma", "private");
-        Response->set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
-        AddCORS();
-        Response->sendFile(File.path(),MT.ContentType);
-    }
-
-    void RESTAPIHandler::SendFile(Poco::TemporaryFile &TempAvatar, const std::string &Type, const std::string & Name) {
-        auto MT = Utils::FindMediaType(Name);
-        if(MT.Encoding==Utils::BINARY) {
-            Response->set("Content-Transfer-Encoding","binary");
-            Response->set("Accept-Ranges", "bytes");
-        }
-        Response->set("Content-Disposition", "attachment; filename=" + Name );
-        Response->set("Accept-Ranges", "bytes");
-        Response->set("Cache-Control", "private");
-        Response->set("Pragma", "private");
-        Response->set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
-        AddCORS();
-        Response->sendFile(TempAvatar.path(),MT.ContentType);
-	}
-
-    void RESTAPIHandler::SendHTMLFileBack(Poco::File & File,
-                          const Types::StringPairVec & FormVars) {
-        Response->set("Pragma", "private");
-        Response->set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
-        Response->set("Content-Length", std::to_string(File.getSize()));
-        AddCORS();
-        auto FormContent = Utils::LoadFile(File.path());
-        Utils::ReplaceVariables(FormContent, FormVars);
-        Response->setChunkedTransferEncoding(true);
-        Response->setContentType("text/html");
-        std::ostream& ostr = Response->send();
-        ostr << FormContent;
-	}
-
-    void RESTAPIHandler::ReturnStatus(Poco::Net::HTTPResponse::HTTPStatus Status, bool CloseConnection) {
-		PrepareResponse(Status, CloseConnection);
-		if(Status == Poco::Net::HTTPResponse::HTTP_NO_CONTENT) {
-			Response->setContentLength(0);
-			Response->erase("Content-Type");
-			Response->setChunkedTransferEncoding(false);
-		}
-		Response->send();
-	}
-
-	bool RESTAPIHandler::ContinueProcessing() {
-		if (Request->getMethod() == Poco::Net::HTTPRequest::HTTP_OPTIONS) {
-			ProcessOptions();
-			return false;
-		} else if (std::find(Methods_.begin(), Methods_.end(), Request->getMethod()) == Methods_.end()) {
-			BadRequest(RESTAPI::Errors::UnsupportedHTTPMethod);
-			return false;
-		}
-
-		return true;
-	}
-
-	bool RESTAPIHandler::IsAuthorized() {
-	    if(Internal_) {
-	        auto Allowed = Daemon()->IsValidAPIKEY(*Request);
-	        if(!Allowed) {
-	            if(Server_.LogBadTokens(false)) {
-	                Logger_.debug(Poco::format("I-REQ-DENIED(%s): Method='%s' Path='%s",
-                                               Utils::FormatIPv6(Request->clientAddress().toString()),
-                                               Request->getMethod(), Request->getURI()));
-	            }
-	        } else {
-	            auto Id = Request->get("X-INTERNAL-NAME", "unknown");
-	            if(Server_.LogIt(Request->getMethod(),true)) {
-	                Logger_.debug(Poco::format("I-REQ-ALLOWED(%s): User='%s' Method='%s' Path='%s",
-                                               Utils::FormatIPv6(Request->clientAddress().toString()), Id,
-                                               Request->getMethod(), Request->getURI()));
-	            }
-	        }
-            return Allowed;
-	    } else {
-            if (SessionToken_.empty()) {
-                try {
-                    Poco::Net::OAuth20Credentials Auth(*Request);
-                    if (Auth.getScheme() == "Bearer") {
-                        SessionToken_ = Auth.getBearerToken();
-                    }
-                } catch (const Poco::Exception &E) {
-                    Logger_.log(E);
-                }
-            }
-#ifdef    TIP_SECURITY_SERVICE
-            if (AuthService()->IsAuthorized(*Request, SessionToken_, UserInfo_)) {
-#else
-            if (AuthClient()->IsAuthorized(*Request, SessionToken_, UserInfo_)) {
-#endif
-                if(Server_.LogIt(Request->getMethod(),true)) {
-                    Logger_.debug(Poco::format("X-REQ-ALLOWED(%s): User='%s@%s' Method='%s' Path='%s",
-                         Utils::FormatIPv6(Request->clientAddress().toString()),
-                         UserInfo_.userinfo.email,
-                         Request->clientAddress().toString(),
-                         Request->getMethod(),
-                         Request->getURI()));
-                }
-                return true;
-            } else {
-                if(Server_.LogBadTokens(true)) {
-                    Logger_.debug(Poco::format("X-REQ-DENIED(%s): Method='%s' Path='%s",
-                         Utils::FormatIPv6(Request->clientAddress().toString()),
-                         Request->getMethod(), Request->getURI()));
-                }
-                UnAuthorized();
-            }
-            return false;
-        }
-	}
-
-	void RESTAPIHandler::ReturnObject(Poco::JSON::Object &Object) {
-		PrepareResponse();
-		std::ostream &Answer = Response->send();
-		Poco::JSON::Stringifier::stringify(Object, Answer);
-	}
-
-	void RESTAPIHandler::ReturnCountOnly(uint64_t Count) {
-	    Poco::JSON::Object  Answer;
-	    Answer.set("count", Count);
-        ReturnObject(Answer);
-	}
-
-	bool RESTAPIHandler::InitQueryBlock() {
-	    if(QueryBlockInitialized_)
-	        return true;
-	    QueryBlockInitialized_=true;
-		QB_.SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
-		QB_.StartDate = GetParameter(RESTAPI::Protocol::STARTDATE, 0);
-		QB_.EndDate = GetParameter(RESTAPI::Protocol::ENDDATE, 0);
-		QB_.Offset = GetParameter(RESTAPI::Protocol::OFFSET, 1);
-		QB_.Limit = GetParameter(RESTAPI::Protocol::LIMIT, 100);
-		QB_.Filter = GetParameter(RESTAPI::Protocol::FILTER, "");
-		QB_.Select = GetParameter(RESTAPI::Protocol::SELECT, "");
-		QB_.Lifetime = GetBoolParameter(RESTAPI::Protocol::LIFETIME,false);
-		QB_.LogType = GetParameter(RESTAPI::Protocol::LOGTYPE,0);
-		QB_.LastOnly = GetBoolParameter(RESTAPI::Protocol::LASTONLY,false);
-		QB_.Newest = GetBoolParameter(RESTAPI::Protocol::NEWEST,false);
-		QB_.CountOnly = GetBoolParameter(RESTAPI::Protocol::COUNTONLY,false);
-
-		if(QB_.Offset<1)
-		    QB_.Offset=1;
-		return true;
-	}
-
-	[[nodiscard]] uint64_t RESTAPIHandler::Get(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, uint64_t Default){
-		if(Obj->has(Parameter))
-			return Obj->get(Parameter);
-		return Default;
-	}
-
-	[[nodiscard]] std::string RESTAPIHandler::GetS(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, const std::string & Default){
-		if(Obj->has(Parameter))
-			return Obj->get(Parameter).toString();
-		return Default;
-	}
-
-	[[nodiscard]] bool RESTAPIHandler::GetB(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, bool Default){
-		if(Obj->has(Parameter))
-			return Obj->get(Parameter).toString()=="true";
-		return Default;
-	}
-
-	[[nodiscard]] uint64_t RESTAPIHandler::GetWhen(const Poco::JSON::Object::Ptr &Obj) {
-		return RESTAPIHandler::Get(RESTAPI::Protocol::WHEN, Obj);
-	}
-}

src/RESTAPI_handler.h

@@ -1,233 +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.
-//
-
-#ifndef UCENTRAL_RESTAPI_HANDLER_H
-#define UCENTRAL_RESTAPI_HANDLER_H
-
-#include "Poco/URI.h"
-#include "Poco/Net/HTTPRequestHandler.h"
-#include "Poco/Net/HTTPRequestHandlerFactory.h"
-#include "Poco/Net/HTTPServerRequest.h"
-#include "Poco/Net/HTTPServerResponse.h"
-#include "Poco/Net/NetException.h"
-#include "Poco/Net/PartHandler.h"
-
-#include "Poco/Logger.h"
-#include "Poco/File.h"
-#include "Poco/TemporaryFile.h"
-#include "Poco/JSON/Object.h"
-#include "Poco/CountingStream.h"
-#include "Poco/NullStream.h"
-
-#include "RESTAPI_SecurityObjects.h"
-#include "RESTAPI_utils.h"
-#include "RESTAPI_GenericServer.h"
-
-namespace OpenWifi {
-
-    class RESTAPI_PartHandler: public Poco::Net::PartHandler
-    {
-    public:
-        RESTAPI_PartHandler():
-                _length(0)
-        {
-        }
-
-        void handlePart(const Poco::Net::MessageHeader& header, std::istream& stream) override
-        {
-            _type = header.get("Content-Type", "(unspecified)");
-            if (header.has("Content-Disposition"))
-            {
-                std::string disp;
-                Poco::Net::NameValueCollection params;
-                Poco::Net::MessageHeader::splitParameters(header["Content-Disposition"], disp, params);
-                _name = params.get("name", "(unnamed)");
-                _fileName = params.get("filename", "(unnamed)");
-            }
-
-            Poco::CountingInputStream istr(stream);
-            Poco::NullOutputStream ostr;
-            Poco::StreamCopier::copyStream(istr, ostr);
-            _length = (int)istr.chars();
-        }
-
-        [[nodiscard]] int length() const
-        {
-            return _length;
-        }
-
-        [[nodiscard]] const std::string& name() const
-        {
-            return _name;
-        }
-
-        [[nodiscard]] const std::string& fileName() const
-        {
-            return _fileName;
-        }
-
-        [[nodiscard]] const std::string& contentType() const
-        {
-            return _type;
-        }
-
-    private:
-        int _length;
-        std::string _type;
-        std::string _name;
-        std::string _fileName;
-    };
-
-    class RESTAPIHandler : public Poco::Net::HTTPRequestHandler {
-	  public:
-		struct QueryBlock {
-			uint64_t StartDate = 0 , EndDate = 0 , Offset = 0 , Limit = 0, LogType = 0 ;
-			std::string SerialNumber, Filter, Select;
-			bool Lifetime=false, LastOnly=false, Newest=false, CountOnly=false;
-		};
-
-		typedef std::map<std::string, std::string> BindingMap;
-
-		RESTAPIHandler(BindingMap map, Poco::Logger &l, std::vector<std::string> Methods, RESTAPI_GenericServer & Server, bool Internal=false, bool AlwaysAuthorize=true)
-		: Bindings_(std::move(map)), Logger_(l), Methods_(std::move(Methods)), Server_(Server), Internal_(Internal), AlwaysAuthorize_(AlwaysAuthorize) {}
-
-		static bool ParseBindings(const std::string & Request, const std::list<const char *> & EndPoints, BindingMap &Keys);
-		void PrintBindings();
-		void ParseParameters();
-
-		void AddCORS();
-	 	void SetCommonHeaders(bool CloseConnection=false);
-		void ProcessOptions();
-		void
-		PrepareResponse(Poco::Net::HTTPResponse::HTTPStatus Status = Poco::Net::HTTPResponse::HTTP_OK,
-						bool CloseConnection = false);
-		bool ContinueProcessing();
-		bool IsAuthorized();
-
-		uint64_t GetParameter(const std::string &Name, uint64_t Default);
-		std::string GetParameter(const std::string &Name, const std::string &Default);
-		bool GetBoolParameter(const std::string &Name, bool Default);
-
-		void BadRequest(const std::string &Reason );
-		void InternalError(const std::string &Reason = "");
-		void UnAuthorized(const std::string &Reason = "");
-		void ReturnObject(Poco::JSON::Object &Object);
-		void NotFound();
-		void OK();
-		void ReturnStatus(Poco::Net::HTTPResponse::HTTPStatus Status,
-						  bool CloseConnection=false);
-		void SendFile(Poco::File & File, const std::string & UUID);
-		void SendHTMLFileBack(Poco::File & File,
-                              const Types::StringPairVec & FormVars);
-        void SendFile(Poco::TemporaryFile &TempAvatar, const std::string &Type, const std::string & Name);
-
-        void SendFile(Poco::File & File);
-
-        const std::string &GetBinding(const std::string &Name, const std::string &Default);
-		bool InitQueryBlock();
-
-		void ReturnCountOnly(uint64_t Count);
-
-		[[nodiscard]] static uint64_t Get(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, uint64_t Default=0);
-		[[nodiscard]] static std::string GetS(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, const std::string & Default="");
-		[[nodiscard]] static bool GetB(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, bool Default=false);
-		[[nodiscard]] static uint64_t GetWhen(const Poco::JSON::Object::Ptr &Obj);
-		bool HasParameter(const std::string &QueryParameter, std::string &Value);
-		bool HasParameter(const std::string &QueryParameter, uint64_t & Value);
-
-		static bool AssignIfPresent(const Poco::JSON::Object::Ptr &O, const std::string &Field, std::string &Value);
-		static bool AssignIfPresent(const Poco::JSON::Object::Ptr &O, const std::string &Field, uint64_t &Value);
-
-		template<typename T> void ReturnObject(const char *Name, const std::vector<T> & Objects) {
-		    Poco::JSON::Object  Answer;
-		    RESTAPI_utils::field_to_json(Answer,Name,Objects);
-            ReturnObject(Answer);
-		}
-
-		Poco::Logger & Logger() { return Logger_; }
-
-		void handleRequest(Poco::Net::HTTPServerRequest &request,
-                           Poco::Net::HTTPServerResponse &response) final;
-
-		virtual void DoGet() = 0 ;
-		virtual void DoDelete() = 0 ;
-		virtual void DoPost() = 0 ;
-		virtual void DoPut() = 0 ;
-
-		const Poco::JSON::Object::Ptr & ParseStream();
-
-	  protected:
-		BindingMap 					Bindings_;
-		Poco::URI::QueryParameters 	Parameters_;
-		Poco::Logger 				&Logger_;
-		std::string 				SessionToken_;
-		SecurityObjects::UserInfoAndPolicy 	UserInfo_;
-		std::vector<std::string> 	Methods_;
-		QueryBlock					QB_;
-		bool                        Internal_=false;
-		bool                        QueryBlockInitialized_=false;
-		Poco::Net::HTTPServerRequest    *Request= nullptr;
-		Poco::Net::HTTPServerResponse   *Response= nullptr;
-		bool                        AlwaysAuthorize_=true;
-		Poco::JSON::Parser          IncomingParser_;
-		RESTAPI_GenericServer       & Server_;
-	};
-
-	class RESTAPI_UnknownRequestHandler : public RESTAPIHandler {
-	  public:
-		RESTAPI_UnknownRequestHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server)
-			: RESTAPIHandler(bindings, L, std::vector<std::string>{}, Server) {}
-        inline void DoGet() override {};
-		inline void DoPost() override {};
-		inline void DoPut() override {};
-		inline void DoDelete() override {};
-    };
-
-	template<class T>
-	constexpr auto test_has_PathName_method(T*)
-	-> decltype(  T::PathName() , std::true_type{} )
-	{
-		return std::true_type{};
-	}
-	constexpr auto test_has_PathName_method(...) -> std::false_type
-	{
-		return std::false_type{};
-	}
-
-	template<typename T, typename... Args>
-	RESTAPIHandler * RESTAPI_Router(const std::string & RequestedPath, RESTAPIHandler::BindingMap &Bindings, Poco::Logger & Logger, RESTAPI_GenericServer & Server) {
-		static_assert(test_has_PathName_method((T*)nullptr), "Class must have a static PathName() method.");
-		if(RESTAPIHandler::ParseBindings(RequestedPath,T::PathName(),Bindings)) {
-			return new T(Bindings, Logger, Server, false);
-		}
-
-		if constexpr (sizeof...(Args) == 0) {
-			return new RESTAPI_UnknownRequestHandler(Bindings,Logger, Server);
-		} else {
-			return RESTAPI_Router<Args...>(RequestedPath, Bindings, Logger, Server);
-		}
-	}
-
-    template<typename T, typename... Args>
-    RESTAPIHandler * RESTAPI_Router_I(const std::string & RequestedPath, RESTAPIHandler::BindingMap &Bindings, Poco::Logger & Logger, RESTAPI_GenericServer & Server) {
-        static_assert(test_has_PathName_method((T*)nullptr), "Class must have a static PathName() method.");
-        if(RESTAPIHandler::ParseBindings(RequestedPath,T::PathName(),Bindings)) {
-            return new T(Bindings, Logger, Server, true);
-        }
-
-        if constexpr (sizeof...(Args) == 0) {
-            return new RESTAPI_UnknownRequestHandler(Bindings,Logger, Server);
-        } else {
-            return RESTAPI_Router_I<Args...>(RequestedPath, Bindings, Logger, Server);
-        }
-    }
-
-
-}
-
-#endif //UCENTRAL_RESTAPI_HANDLER_H

src/RESTAPI_historyHandler.cpp

@@ -1,56 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-13.
-//
-
-#include "RESTAPI_historyHandler.h"
-
-//
-// Created by stephane bourque on 2021-05-09.
-//
-
-#include "RESTAPI_historyHandler.h"
-#include "StorageService.h"
-#include "RESTAPI_protocol.h"
-#include "RESTAPI_errors.h"
-
-namespace OpenWifi {
-    void
-    RESTAPI_historyHandler::DoGet() {
-        auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-
-        if(SerialNumber.empty()) {
-            BadRequest(RESTAPI::Errors::MissingSerialNumber);
-            return;
-        }
-
-        FMSObjects::RevisionHistoryEntryVec H;
-        if (Storage()->GetHistory(SerialNumber, QB_.Offset, QB_.Limit, H)) {
-            Poco::JSON::Array A;
-            for (auto const &i:H) {
-                Poco::JSON::Object O;
-                i.to_json(O);
-                A.add(O);
-            }
-            Poco::JSON::Object Answer;
-            Answer.set(RESTAPI::Protocol::HISTORY, A);
-            ReturnObject(Answer);
-            return;
-        }
-        NotFound();
-    }
-
-    void RESTAPI_historyHandler::DoDelete() {
-        auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-        auto Id = GetParameter(RESTAPI::Protocol::ID, "");
-        if (SerialNumber.empty() || Id.empty()) {
-            BadRequest(RESTAPI::Errors::IdOrSerialEmpty);
-            return;
-        }
-
-        if (!Storage()->DeleteHistory(SerialNumber, Id)) {
-            OK();
-            return;
-        }
-        NotFound();
-    }
-}

src/RESTAPI_protocol.h

@@ -1,136 +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.
-//
-
-#ifndef UCENTRALGW_RESTAPI_PROTOCOL_H
-#define UCENTRALGW_RESTAPI_PROTOCOL_H
-
-namespace OpenWifi::RESTAPI::Protocol {
-	static const char * CAPABILITIES = "capabilities";
-	static const char * LOGS = "logs";
-	static const char * HEALTHCHECKS = "healthchecks";
-	static const char * STATISTICS = "statistics";
-	static const char * STATUS = "status";
-	static const char * SERIALNUMBER = "serialNumber";
-	static const char * PERFORM = "perform";
-	static const char * CONFIGURE = "configure";
-	static const char * UPGRADE = "upgrade";
-	static const char * REBOOT = "reboot";
-	static const char * FACTORY = "factory";
-	static const char * LEDS = "leds";
-	static const char * TRACE = "trace";
-	static const char * REQUEST = "request";
-	static const char * WIFISCAN = "wifiscan";
-	static const char * EVENTQUEUE = "eventqueue";
-	static const char * RTTY = "rtty";
-	static const char * COMMAND = "command";
-	static const char * STARTDATE = "startDate";
-	static const char * ENDDATE = "endDate";
-	static const char * OFFSET = "offset";
-	static const char * LIMIT = "limit";
-	static const char * LIFETIME = "lifetime";
-	static const char * UUID = "UUID";
-	static const char * DATA = "data";
-	static const char * CONFIGURATION = "configuration";
-	static const char * WHEN = "when";
-	static const char * URI = "uri";
-	static const char * LOGTYPE = "logType";
-	static const char * VALUES = "values";
-	static const char * TYPES = "types";
-	static const char * PAYLOAD = "payload";
-	static const char * KEEPREDIRECTOR = "keepRedirector";
-	static const char * NETWORK = "network";
-	static const char * INTERFACE = "interface";
-	static const char * BANDS = "bands";
-	static const char * CHANNELS = "channels";
-	static const char * VERBOSE = "verbose";
-	static const char * MESSAGE = "message";
-	static const char * STATE = "state";
-	static const char * HEALTHCHECK = "healthcheck";
-	static const char * PCAP_FILE_TYPE = "pcap";
-	static const char * DURATION = "duration";
-	static const char * NUMBEROFPACKETS = "numberOfPackets";
-	static const char * FILTER = "filter";
-	static const char * SELECT = "select";
-	static const char * SERIALONLY = "serialOnly";
-	static const char * COUNTONLY = "countOnly";
-	static const char * DEVICEWITHSTATUS = "deviceWithStatus";
-	static const char * DEVICESWITHSTATUS = "devicesWithStatus";
-	static const char * DEVICES = "devices";
-	static const char * COUNT = "count";
-	static const char * SERIALNUMBERS = "serialNumbers";
-	static const char * CONFIGURATIONS = "configurations";
-	static const char * NAME = "name";
-	static const char * COMMANDS = "commands";
-	static const char * COMMANDUUID = "commandUUID";
-	static const char * FIRMWARES = "firmwares";
-	static const char * TOPIC = "topic";
-	static const char * HOST = "host";
-	static const char * OS = "os";
-	static const char * HOSTNAME = "hostname";
-	static const char * PROCESSORS = "processors";
-	static const char * REASON = "reason";
-	static const char * RELOAD = "reload";
-	static const char * SUBSYSTEMS = "subsystems";
-	static const char * FILEUUID = "uuid";
-	static const char * USERID = "userId";
-	static const char * PASSWORD = "password";
-	static const char * TOKEN = "token";
-	static const char * SETLOGLEVEL = "setloglevel";
-	static const char * GETLOGLEVELS = "getloglevels";
-	static const char * GETSUBSYSTEMNAMES = "getsubsystemnames";
-	static const char * GETLOGLEVELNAMES = "getloglevelnames";
-	static const char * STATS = "stats";
-	static const char * PARAMETERS = "parameters";
-	static const char * VALUE = "value";
-	static const char * LASTONLY = "lastOnly";
-	static const char * NEWEST = "newest";
-	static const char * ACTIVESCAN = "activeScan";
-	static const char * LIST = "list";
-	static const char * TAG = "tag";
-	static const char * TAGLIST = "tagList";
-    static const char * DESCRIPTION = "description";
-    static const char * NOTES = "notes";
-    static const char * DEVICETYPE = "deviceType";
-    static const char * REVISION = "revision";
-    static const char * AGES = "ages";
-    static const char * REVISIONS = "revisions";
-    static const char * DEVICETYPES = "deviceTypes";
-    static const char * LATESTONLY = "latestOnly";
-    static const char * IDONLY = "idOnly";
-    static const char * REVISIONSET = "revisionSet";
-    static const char * DEVICESET = "deviceSet";
-    static const char * HISTORY = "history";
-    static const char * ID = "id";
-    static const char * VERSION = "version";
-    static const char * TIMES = "times";
-    static const char * UPTIME = "uptime";
-    static const char * START = "start";
-
-    static const char * NEWPASSWORD = "newPassword";
-    static const char * USERS = "users";
-
-    static const char * ERRORTEXT = "errorText";
-    static const char * ERRORCODE = "errorCode";
-    static const char * AVATARID = "avatarId";
-    static const char * UNNAMED = "(unnamed)";
-    static const char * UNSPECIFIED = "(unspecified)";
-    static const char * CONTENTDISPOSITION = "Content-Disposition";
-    static const char * CONTENTTYPE = "Content-Type";
-
-    static const char * REQUIREMENTS = "requirements";
-    static const char * PASSWORDPATTERN = "passwordPattern";
-    static const char * ACCESSPOLICY = "accessPolicy";
-    static const char * PASSWORDPOLICY = "passwordPolicy";
-    static const char * FORGOTPASSWORD = "forgotPassword";
-    static const char * ME = "me";
-    static const char * TELEMETRY = "telemetry";
-    static const char * INTERVAL = "interval";
-
-}
-
-#endif // UCENTRALGW_RESTAPI_PROTOCOL_H

src/RESTAPI_server.cpp

@@ -1,89 +0,0 @@
-//
-// Created by stephane bourque on 2021-05-09.
-//
-
-#include "Poco/URI.h"
-
-#include "RESTAPI_server.h"
-#include "Utils.h"
-#include "RESTAPI_handler.h"
-
-#include "RESTAPI_firmwareHandler.h"
-#include "RESTAPI_firmwaresHandler.h"
-#include "RESTAPI_system_command.h"
-#include "RESTAPI_firmwareAgeHandler.h"
-#include "RESTAPI_connectedDeviceHandler.h"
-#include "RESTAPI_connectedDevicesHandler.h"
-#include "RESTAPI_historyHandler.h"
-#include "RESTAPI_deviceReportHandler.h"
-
-namespace OpenWifi {
-
-    class RESTAPI_server *RESTAPI_server::instance_ = nullptr;
-
-    RESTAPI_server::RESTAPI_server() noexcept:
-            SubSystemServer("RESTAPIServer", "RESTAPIServer", "openwifi.restapi")
-    {
-    }
-
-    int RESTAPI_server::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 RequestHandlerFactory(Server_), Pool_, Sock, Params);
-            NewServer->start();
-            RESTServers_.push_back(std::move(NewServer));
-        }
-
-        return 0;
-    }
-
-    Poco::Net::HTTPRequestHandler *RequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
-        Poco::URI uri(Request.getURI());
-        auto *Path = uri.getPath().c_str();
-        RESTAPIHandler::BindingMap Bindings;
-
-        // std::cout << "Path: " << Request.getURI() << std::endl;
-
-        return  RESTAPI_Router<
-                RESTAPI_firmwaresHandler,
-                RESTAPI_firmwareHandler,
-                RESTAPI_system_command,
-                RESTAPI_firmwareAgeHandler,
-                RESTAPI_connectedDevicesHandler,
-                RESTAPI_connectedDeviceHandler,
-                RESTAPI_historyHandler,
-                RESTAPI_deviceReportHandler
-                >(Path,Bindings,Logger_, Server_);
-    }
-
-    void RESTAPI_server::Stop() {
-        Logger_.information("Stopping ");
-        for( const auto & svr : RESTServers_ )
-            svr->stop();
-        RESTServers_.clear();
-    }
-
-    void RESTAPI_server::reinitialize(Poco::Util::Application &self) {
-        Daemon()->LoadConfigurationFile();
-        Logger_.information("Reinitializing.");
-        Stop();
-        Start();
-    }
-
-}  // namespace

src/RESTAPI_server.h

@@ -1,59 +0,0 @@
-//
-// Created by stephane bourque on 2021-05-09.
-//
-
-#ifndef UCENTRALFWS_RESTAPI_SERVER_H
-#define UCENTRALFWS_RESTAPI_SERVER_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 "SubSystemServer.h"
-#include "RESTAPI_GenericServer.h"
-
-namespace OpenWifi {
-
-    class RESTAPI_server : public SubSystemServer {
-
-    public:
-        RESTAPI_server() noexcept;
-
-        static RESTAPI_server *instance() {
-            if (instance_ == nullptr) {
-                instance_ = new RESTAPI_server;
-            }
-            return instance_;
-        }
-        int Start() override;
-        void Stop() override;
-        void reinitialize(Poco::Util::Application &self) override;
-
-    private:
-        static RESTAPI_server *instance_;
-        std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-        Poco::ThreadPool	    Pool_;
-        RESTAPI_GenericServer   Server_;
-    };
-
-    inline RESTAPI_server * RESTAPI_server() { return RESTAPI_server::instance(); };
-
-    class RequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
-        public:
-            RequestHandlerFactory(RESTAPI_GenericServer & Server) :
-                    Logger_(RESTAPI_server::instance()->Logger()),
-                    Server_(Server)
-            {
-
-            }
-
-            Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
-        private:
-            Poco::Logger            &Logger_;
-            RESTAPI_GenericServer   &Server_;
-    };
-}
-
-#endif //UCENTRALFWS_RESTAPI_SERVER_H

src/RESTAPI_system_command.cpp

@@ -1,146 +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 "RESTAPI_system_command.h"
-
-#include "Poco/Exception.h"
-#include "Poco/JSON/Parser.h"
-#include "Poco/DateTime.h"
-#include "Poco/DateTimeFormat.h"
-
-#include "Daemon.h"
-#include "RESTAPI_protocol.h"
-#include "RESTAPI_errors.h"
-#include <thread>
-#include <chrono>
-
-using namespace std::chrono_literals;
-
-namespace OpenWifi {
-	void RESTAPI_system_command::DoPost() {
-		auto Obj = ParseStream();
-		if (Obj->has(RESTAPI::Protocol::COMMAND)) {
-			auto Command = Poco::toLower(Obj->get(RESTAPI::Protocol::COMMAND).toString());
-			if (Command == RESTAPI::Protocol::SETLOGLEVEL) {
-				if (Obj->has(RESTAPI::Protocol::SUBSYSTEMS) &&
-					Obj->isArray(RESTAPI::Protocol::SUBSYSTEMS)) {
-					auto ParametersBlock = Obj->getArray(RESTAPI::Protocol::SUBSYSTEMS);
-					for (const auto &i : *ParametersBlock) {
-						Poco::JSON::Parser pp;
-						auto InnerObj = pp.parse(i).extract<Poco::JSON::Object::Ptr>();
-						if (InnerObj->has(RESTAPI::Protocol::TAG) &&
-							InnerObj->has(RESTAPI::Protocol::VALUE)) {
-							auto Name = GetS(RESTAPI::Protocol::TAG, InnerObj);
-							auto Value = GetS(RESTAPI::Protocol::VALUE, InnerObj);
-							Daemon()->SetSubsystemLogLevel(Name, Value);
-							Logger_.information(
-								Poco::format("Setting log level for %s at %s", Name, Value));
-						}
-					}
-					OK();
-					return;
-				}
-			} else if (Command == RESTAPI::Protocol::GETLOGLEVELS) {
-				auto CurrentLogLevels = Daemon()->GetLogLevels();
-				Poco::JSON::Object Result;
-				Poco::JSON::Array Array;
-				for (auto &[Name, Level] : CurrentLogLevels) {
-					Poco::JSON::Object Pair;
-					Pair.set(RESTAPI::Protocol::TAG, Name);
-					Pair.set(RESTAPI::Protocol::VALUE, Level);
-					Array.add(Pair);
-				}
-				Result.set(RESTAPI::Protocol::TAGLIST, Array);
-				ReturnObject(Result);
-				return;
-			} else if (Command == RESTAPI::Protocol::GETLOGLEVELNAMES) {
-				Poco::JSON::Object Result;
-				Poco::JSON::Array LevelNamesArray;
-				const Types::StringVec &LevelNames = Daemon()->GetLogLevelNames();
-				for (const auto &i : LevelNames)
-					LevelNamesArray.add(i);
-				Result.set(RESTAPI::Protocol::LIST, LevelNamesArray);
-				ReturnObject(Result);
-				return;
-			} else if (Command == RESTAPI::Protocol::GETSUBSYSTEMNAMES) {
-				Poco::JSON::Object Result;
-				Poco::JSON::Array LevelNamesArray;
-				const Types::StringVec &SubSystemNames = Daemon()->GetSubSystems();
-				for (const auto &i : SubSystemNames)
-					LevelNamesArray.add(i);
-				Result.set(RESTAPI::Protocol::LIST, LevelNamesArray);
-				ReturnObject(Result);
-				return;
-			} else if (Command == RESTAPI::Protocol::STATS) {
-
-			} else if (Command == RESTAPI::Protocol::RELOAD) {
-				if (Obj->has(RESTAPI::Protocol::SUBSYSTEMS) &&
-					Obj->isArray(RESTAPI::Protocol::SUBSYSTEMS)) {
-					auto SubSystems = Obj->getArray(RESTAPI::Protocol::SUBSYSTEMS);
-					std::vector<std::string> Names;
-					for (const auto &i : *SubSystems)
-						Names.push_back(i.toString());
-						std::thread	ReloadThread([Names](){
-						std::this_thread::sleep_for(10000ms);
-						for(const auto &i:Names) {
-						    if(i=="daemon")
-						        Daemon()->Reload();
-						    else
-    							Daemon()->Reload(i);
-						}
-					 });
-					ReloadThread.detach();
-				}
-				OK();
-				return;
-			}
-		} else {
-			BadRequest(RESTAPI::Errors::InvalidCommand);
-			return;
-		}
-		BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-	}
-
-	void RESTAPI_system_command::DoGet() {
-		std::string Arg;
-		if(HasParameter("command",Arg) && Arg=="info") {
-			Poco::JSON::Object Answer;
-			Answer.set(RESTAPI::Protocol::VERSION, Daemon()->Version());
-			Answer.set(RESTAPI::Protocol::UPTIME, Daemon()->uptime().totalSeconds());
-			Answer.set(RESTAPI::Protocol::START, Daemon()->startTime().epochTime());
-			Answer.set(RESTAPI::Protocol::OS, Poco::Environment::osName());
-			Answer.set(RESTAPI::Protocol::PROCESSORS, Poco::Environment::processorCount());
-			Answer.set(RESTAPI::Protocol::HOSTNAME, Poco::Environment::nodeName());
-
-			Poco::JSON::Array   Certificates;
-			auto SubSystems = Daemon()->GetFullSubSystems();
-			std::set<std::string>   CertNames;
-
-			for(const auto &i:SubSystems) {
-			    auto Hosts=i->HostSize();
-			    for(uint64_t j=0;j<Hosts;++j) {
-			        auto CertFileName = i->Host(j).CertFile();
-			        if(!CertFileName.empty()) {
-			            auto InsertResult = CertNames.insert(CertFileName);
-			            if(InsertResult.second) {
-			                Poco::JSON::Object  Inner;
-			                Inner.set("filename", CertFileName);
-			                Poco::Crypto::X509Certificate   C(CertFileName);
-			                auto ExpiresOn = C.expiresOn();
-			                Inner.set("expiresOn",ExpiresOn.timestamp().epochTime());
-			                Certificates.add(Inner);
-			            }
-			        }
-			    }
-			}
-			Answer.set("certificates", Certificates);
-			ReturnObject(Answer);
-			return;
-		}
-		BadRequest(RESTAPI::Errors::InvalidCommand);
-	}
-}

src/RESTAPI_system_command.h

@@ -1,32 +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.
-//
-
-#ifndef UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
-#define UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
-
-#include "RESTAPI_handler.h"
-
-namespace OpenWifi {
-class RESTAPI_system_command : public RESTAPIHandler {
-  public:
-    RESTAPI_system_command(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
-		: RESTAPIHandler(bindings, L,
-						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
-														  Poco::Net::HTTPRequest::HTTP_GET,
-														  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-														  Server,
-						 Internal) {}
-	static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/system"};}
-
-	void DoGet() final;
-	void DoPost() final;
-	void DoPut() final {};
-	void DoDelete() final {};
-	};
-}
-#endif // UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H

src/RESTAPI_utils.cpp

@@ -1,17 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-05.
-//
-
-#include "RESTAPI_utils.h"
-
-namespace OpenWifi::RESTAPI_utils {
-
-	void EmbedDocument(const std::string & ObjName, Poco::JSON::Object & Obj, const std::string &ObjStr) {
-		std::string D = ObjStr.empty() ? "{}" : ObjStr;
-		Poco::JSON::Parser P;
-		Poco::Dynamic::Var result = P.parse(D);
-		const auto &DetailsObj = result.extract<Poco::JSON::Object::Ptr>();
-		Obj.set(ObjName, DetailsObj);
-	}
-}
-

src/RESTAPI_utils.h

@@ -1,216 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-05.
-//
-
-#ifndef UCENTRALGW_RESTAPI_UTILS_H
-#define UCENTRALGW_RESTAPI_UTILS_H
-#include <functional>
-
-#include "Poco/JSON/Object.h"
-#include "Poco/JSON/Parser.h"
-#include "Poco/Net/HTTPServerRequest.h"
-#include "OpenWifiTypes.h"
-#include "Utils.h"
-
-namespace OpenWifi::RESTAPI_utils {
-
-	void EmbedDocument(const std::string & ObjName, Poco::JSON::Object & Obj, const std::string &ObjStr);
-
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, bool V) {
-		Obj.set(Field,V);
-	}
-
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const std::string & S) {
-		Obj.set(Field,S);
-	}
-
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const char * S) {
-		Obj.set(Field,S);
-	}
-
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, uint64_t V) {
-		Obj.set(Field,V);
-	}
-
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::StringVec &V) {
-		Poco::JSON::Array	A;
-		for(const auto &i:V)
-			A.add(i);
-		Obj.set(Field,A);
-	}
-
-    inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::CountedMap &M) {
-        Poco::JSON::Array	A;
-        for(const auto &[Key,Value]:M) {
-            Poco::JSON::Object  O;
-            O.set("tag",Key);
-            O.set("value", Value);
-            A.add(O);
-        }
-        Obj.set(Field,A);
-    }
-
-
-    template<typename T> void field_to_json(Poco::JSON::Object &Obj,
-					   						const char *Field,
-					   						const T &V,
-											std::function<std::string(const T &)> F) {
-		Obj.set(Field, F(V));
-	}
-
-	template<typename T> bool field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, T & V,
-											std::function<T(const std::string &)> F) {
-		if(Obj->has(Field))
-			V = F(Obj->get(Field).toString());
-		return true;
-	}
-
-	inline void field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, std::string &S) {
-		if(Obj->has(Field))
-			S = Obj->get(Field).toString();
-	}
-
-	inline void field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, uint64_t &V) {
-		if(Obj->has(Field))
-			V = Obj->get(Field);
-	}
-
-	inline void field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, bool &V) {
-		if(Obj->has(Field))
-			V = (Obj->get(Field).toString() == "true");
-	}
-
-	inline void field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, Types::StringVec &V) {
-		if(Obj->isArray(Field)) {
-			V.clear();
-			Poco::JSON::Array::Ptr A = Obj->getArray(Field);
-			for(const auto &i:*A) {
-				V.push_back(i.toString());
-			}
-		}
-	}
-
-	template<class T> void field_to_json(Poco::JSON::Object &Obj, const char *Field, const std::vector<T> &Value) {
-		Poco::JSON::Array Arr;
-		for(const auto &i:Value) {
-			Poco::JSON::Object	AO;
-			i.to_json(AO);
-			Arr.add(AO);
-		}
-		Obj.set(Field, Arr);
-	}
-
-	template<class T> void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, std::vector<T> &Value) {
-		if(Obj->isArray(Field)) {
-			Poco::JSON::Array::Ptr	Arr = Obj->getArray(Field);
-			for(auto &i:*Arr) {
-				auto InnerObj = i.extract<Poco::JSON::Object::Ptr>();
-				T	NewItem;
-				NewItem.from_json(InnerObj);
-				Value.push_back(NewItem);
-			}
-		}
-	}
-
-	template<class T> void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, T &Value) {
-		if(Obj->isObject(Field)) {
-			Poco::JSON::Object::Ptr	A = Obj->getObject(Field);
-			Value.from_json(A);
-		}
-	}
-
-	inline std::string to_string(const Types::StringVec & ObjectArray) {
-		Poco::JSON::Array OutputArr;
-		if(ObjectArray.empty())
-			return "[]";
-		for(auto const &i:ObjectArray) {
-			OutputArr.add(i);
-		}
-		std::ostringstream OS;
-		Poco::JSON::Stringifier::condense(OutputArr,OS);
-		return OS.str();
-	}
-
-	template<class T> std::string to_string(const std::vector<T> & ObjectArray) {
-		Poco::JSON::Array OutputArr;
-		if(ObjectArray.empty())
-			return "[]";
-		for(auto const &i:ObjectArray) {
-			Poco::JSON::Object O;
-			i.to_json(O);
-			OutputArr.add(O);
-		}
-		std::ostringstream OS;
-		Poco::JSON::Stringifier::condense(OutputArr,OS);
-		return OS.str();
-	}
-
-	template<class T> std::string to_string(const T & Object) {
-		Poco::JSON::Object OutputObj;
-		Object.to_json(OutputObj);
-		std::ostringstream OS;
-		Poco::JSON::Stringifier::condense(OutputObj,OS);
-		return OS.str();
-	}
-
-    inline Types::StringVec to_object_array(const std::string & ObjectString) {
-
-        Types::StringVec 	Result;
-        if(ObjectString.empty())
-            return Result;
-
-        try {
-            Poco::JSON::Parser P;
-            auto Object = P.parse(ObjectString).template extract<Poco::JSON::Array::Ptr>();
-            for (auto const i : *Object) {
-                Result.push_back(i.toString());
-            }
-        } catch (...) {
-
-        }
-        return Result;
-    }
-
-    template<class T> std::vector<T> to_object_array(const std::string & ObjectString) {
-
-		std::vector<T>	Result;
-		if(ObjectString.empty())
-			return Result;
-
-		try {
-			Poco::JSON::Parser P;
-			auto Object = P.parse(ObjectString).template extract<Poco::JSON::Array::Ptr>();
-			for (auto const i : *Object) {
-				auto InnerObject = i.template extract<Poco::JSON::Object::Ptr>();
-				T Obj;
-				Obj.from_json(InnerObject);
-				Result.push_back(Obj);
-			}
-		} catch (...) {
-
-		}
-		return Result;
-	}
-
-	template<class T> T to_object(const std::string & ObjectString) {
-		T	Result;
-
-		if(ObjectString.empty())
-			return Result;
-
-		Poco::JSON::Parser	P;
-		auto Object = P.parse(ObjectString).template extract<Poco::JSON::Object::Ptr>();
-		Result.from_json(Object);
-
-		return Result;
-	}
-
-    template<class T> bool from_request(T & Obj, Poco::Net::HTTPServerRequest &Request) {
-        Poco::JSON::Parser IncomingParser;
-        auto RawObject = IncomingParser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
-        Obj.from_json(RawObject);
-        return true;
-    }
-}
-
-#endif // UCENTRALGW_RESTAPI_UTILS_H

src/RESTObjects/RESTAPI_AnalyticsObjects.cpp

@@ -0,0 +1,624 @@
+//
+// Created by stephane bourque on 2022-01-10.
+//
+
+#include "RESTAPI_AnalyticsObjects.h"
+#include "RESTAPI_ProvObjects.h"
+#include "framework/MicroService.h"
+
+using OpenWifi::RESTAPI_utils::field_to_json;
+using OpenWifi::RESTAPI_utils::field_from_json;
+
+namespace OpenWifi::AnalyticsObjects {
+
+    void Report::reset() {
+    }
+
+    void Report::to_json([[maybe_unused]] Poco::JSON::Object &Obj) const {
+    }
+
+    void VenueInfo::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,"retention",retention);
+        field_to_json(Obj,"interval",interval);
+        field_to_json(Obj,"monitorSubVenues",monitorSubVenues);
+    }
+
+    bool VenueInfo::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,"retention",retention);
+            field_from_json(Obj,"interval",interval);
+            field_from_json(Obj,"monitorSubVenues",monitorSubVenues);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void BoardInfo::to_json(Poco::JSON::Object &Obj) const {
+        info.to_json(Obj);
+        field_to_json(Obj,"venueList",venueList);
+    }
+
+    bool BoardInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            info.from_json(Obj);
+            field_from_json(Obj,"venueList",venueList);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceInfo::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"boardId",boardId);
+        field_to_json(Obj,"type",type);
+        field_to_json(Obj,"serialNumber",serialNumber);
+        field_to_json(Obj,"deviceType",deviceType);
+        field_to_json(Obj,"lastContact",lastContact);
+        field_to_json(Obj,"lastPing",lastPing);
+        field_to_json(Obj,"lastState",lastState);
+        field_to_json(Obj,"lastFirmware",lastFirmware);
+        field_to_json(Obj,"lastFirmwareUpdate",lastFirmwareUpdate);
+        field_to_json(Obj,"lastConnection",lastConnection);
+        field_to_json(Obj,"lastDisconnection",lastDisconnection);
+        field_to_json(Obj,"pings",pings);
+        field_to_json(Obj,"states",states);
+        field_to_json(Obj,"connected",connected);
+        field_to_json(Obj,"connectionIp",connectionIp);
+        field_to_json(Obj,"associations_2g",associations_2g);
+        field_to_json(Obj,"associations_5g",associations_5g);
+        field_to_json(Obj,"associations_6g",associations_6g);
+        field_to_json(Obj,"health",health);
+        field_to_json(Obj,"lastHealth",lastHealth);
+        field_to_json(Obj,"locale",locale);
+        field_to_json(Obj,"uptime",uptime);
+        field_to_json(Obj,"memory",memory);
+    }
+
+    bool DeviceInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"boardId",boardId);
+            field_from_json(Obj,"type",type);
+            field_from_json(Obj,"serialNumber",serialNumber);
+            field_from_json(Obj,"deviceType",deviceType);
+            field_from_json(Obj,"lastContact",lastContact);
+            field_from_json(Obj,"lastPing",lastPing);
+            field_from_json(Obj,"lastState",lastState);
+            field_from_json(Obj,"lastFirmware",lastFirmware);
+            field_from_json(Obj,"lastFirmwareUpdate",lastFirmwareUpdate);
+            field_from_json(Obj,"lastConnection",lastConnection);
+            field_from_json(Obj,"lastDisconnection",lastDisconnection);
+            field_from_json(Obj,"pings",pings);
+            field_from_json(Obj,"states",states);
+            field_from_json(Obj,"connected",connected);
+            field_from_json(Obj,"connectionIp",connectionIp);
+            field_from_json(Obj,"associations_2g",associations_2g);
+            field_from_json(Obj,"associations_5g",associations_5g);
+            field_from_json(Obj,"associations_6g",associations_6g);
+            field_from_json(Obj,"health",health);
+            field_from_json(Obj,"lastHealth",lastHealth);
+            field_from_json(Obj,"locale",locale);
+            field_from_json(Obj,"uptime",uptime);
+            field_from_json(Obj,"memory",memory);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceInfoList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"devices",devices);
+    }
+
+    bool DeviceInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"devices",devices);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void UE_rate::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"bitrate",bitrate);
+        field_to_json(Obj,"mcs",mcs);
+        field_to_json(Obj,"nss",nss);
+        field_to_json(Obj,"ht",ht);
+        field_to_json(Obj,"sgi",sgi);
+        field_to_json(Obj,"chwidth",chwidth);
+    }
+
+    bool UE_rate::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"bitrate",bitrate);
+            field_from_json(Obj,"mcs",mcs);
+            field_from_json(Obj,"nss",nss);
+            field_from_json(Obj,"ht",ht);
+            field_from_json(Obj,"sgi",sgi);
+            field_from_json(Obj,"chwidth",chwidth);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void UETimePoint::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"station",station);
+        field_to_json(Obj,"rssi",rssi);
+        field_to_json(Obj,"tx_bytes",tx_bytes);
+        field_to_json(Obj,"rx_bytes",rx_bytes);
+        field_to_json(Obj,"tx_duration",tx_duration);
+        field_to_json(Obj,"rx_packets",rx_packets);
+        field_to_json(Obj,"tx_packets",tx_packets);
+        field_to_json(Obj,"tx_retries",tx_retries);
+        field_to_json(Obj,"tx_failed",tx_failed);
+        field_to_json(Obj,"connected",connected);
+        field_to_json(Obj,"inactive",inactive);
+        field_to_json(Obj,"tx_rate",tx_rate);
+        field_to_json(Obj,"rx_rate",rx_rate);
+//      field_to_json(Obj, "tidstats", tidstats);
+
+        field_to_json(Obj,"tx_bytes_bw",tx_bytes_bw);
+        field_to_json(Obj,"rx_bytes_bw",rx_bytes_bw);
+        field_to_json(Obj,"tx_packets_bw",tx_packets_bw);
+        field_to_json(Obj,"rx_packets_bw",rx_packets_bw);
+        field_to_json(Obj,"tx_failed_pct",tx_failed_pct);
+        field_to_json(Obj,"tx_retries_pct",tx_retries_pct);
+        field_to_json(Obj,"tx_duration_pct",tx_duration_pct);
+
+        field_to_json(Obj,"tx_bytes_delta",tx_bytes_delta);
+        field_to_json(Obj,"rx_bytes_delta",rx_bytes_delta);
+        field_to_json(Obj,"tx_packets_delta",tx_packets_delta);
+        field_to_json(Obj,"rx_packets_delta",rx_packets_delta);
+        field_to_json(Obj,"tx_failed_delta",tx_failed_delta);
+        field_to_json(Obj,"tx_retries_delta",tx_retries_delta);
+        field_to_json(Obj,"tx_duration_delta",tx_duration_delta);
+    }
+
+    bool UETimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"station",station);
+            field_from_json(Obj,"rssi",rssi);
+            field_from_json(Obj,"tx_bytes",tx_bytes);
+            field_from_json(Obj,"rx_bytes",rx_bytes);
+            field_from_json(Obj,"tx_duration",tx_duration);
+            field_from_json(Obj,"rx_packets",rx_packets);
+            field_from_json(Obj,"tx_packets",tx_packets);
+            field_from_json(Obj,"tx_retries",tx_retries);
+            field_from_json(Obj,"tx_failed",tx_failed);
+            field_from_json(Obj,"connected",connected);
+            field_from_json(Obj,"inactive",inactive);
+            field_from_json(Obj,"tx_rate",tx_rate);
+            field_from_json(Obj,"rx_rate",rx_rate);
+//          field_from_json(Obj,"tidstats",tidstats);
+            field_from_json(Obj,"tx_bytes_bw",tx_bytes_bw);
+            field_from_json(Obj,"rx_bytes_bw",rx_bytes_bw);
+            field_from_json(Obj,"tx_packets_bw",tx_packets_bw);
+            field_from_json(Obj,"rx_packets_bw",rx_packets_bw);
+            field_from_json(Obj,"tx_failed_pct",tx_failed_pct);
+            field_from_json(Obj,"tx_retries_pct",tx_retries_pct);
+            field_from_json(Obj,"tx_duration_pct",tx_duration_pct);
+            field_from_json(Obj,"tx_bytes_delta",tx_bytes_delta);
+            field_from_json(Obj,"rx_bytes_delta",rx_bytes_delta);
+            field_from_json(Obj,"tx_packets_delta",tx_packets_delta);
+            field_from_json(Obj,"rx_packets_delta",rx_packets_delta);
+            field_from_json(Obj,"tx_failed_delta",tx_failed_delta);
+            field_from_json(Obj,"tx_retries_delta",tx_retries_delta);
+            field_from_json(Obj,"tx_duration_delta",tx_duration_delta);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void APTimePoint::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"collisions",collisions);
+        field_to_json(Obj,"multicast",multicast);
+        field_to_json(Obj,"rx_bytes",rx_bytes);
+        field_to_json(Obj,"rx_dropped",rx_dropped);
+        field_to_json(Obj,"rx_errors",rx_errors);
+        field_to_json(Obj,"rx_packets",rx_packets);
+        field_to_json(Obj,"tx_bytes",tx_bytes);
+        field_to_json(Obj,"tx_packets",tx_packets);
+        field_to_json(Obj,"tx_dropped",tx_dropped);
+        field_to_json(Obj,"tx_errors",tx_errors);
+        field_to_json(Obj,"tx_packets",tx_packets);
+
+        field_to_json(Obj,"tx_bytes_bw",tx_bytes_bw);
+        field_to_json(Obj,"rx_bytes_bw",rx_bytes_bw);
+        field_to_json(Obj,"rx_dropped_pct",rx_dropped_pct);
+        field_to_json(Obj,"tx_dropped_pct",tx_dropped_pct);
+        field_to_json(Obj,"rx_packets_bw",rx_packets_bw);
+        field_to_json(Obj,"tx_packets_bw",tx_packets_bw);
+        field_to_json(Obj,"rx_errors_pct",rx_errors_pct);
+        field_to_json(Obj,"tx_errors_pct",tx_errors_pct);
+
+        field_to_json(Obj,"tx_bytes_delta",tx_bytes_delta);
+        field_to_json(Obj,"rx_bytes_delta",rx_bytes_delta);
+        field_to_json(Obj,"rx_dropped_delta",rx_dropped_delta);
+        field_to_json(Obj,"tx_dropped_delta",tx_dropped_delta);
+        field_to_json(Obj,"rx_packets_delta",rx_packets_delta);
+        field_to_json(Obj,"tx_packets_delta",tx_packets_delta);
+        field_to_json(Obj,"rx_errors_delta",rx_errors_delta);
+        field_to_json(Obj,"tx_errors_delta",tx_errors_delta);
+    }
+
+    bool APTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"collisions",collisions);
+            field_from_json(Obj,"multicast",multicast);
+            field_from_json(Obj,"rx_bytes",rx_bytes);
+            field_from_json(Obj,"rx_dropped",rx_dropped);
+            field_from_json(Obj,"rx_errors",rx_errors);
+            field_from_json(Obj,"rx_packets",rx_packets);
+            field_from_json(Obj,"tx_bytes",tx_bytes);
+            field_from_json(Obj,"tx_packets",tx_packets);
+            field_from_json(Obj,"tx_dropped",tx_dropped);
+            field_from_json(Obj,"tx_errors",tx_errors);
+            field_from_json(Obj,"tx_packets",tx_packets);
+
+            field_from_json(Obj,"tx_bytes_bw",tx_bytes_bw);
+            field_from_json(Obj,"rx_bytes_bw",rx_bytes_bw);
+            field_from_json(Obj,"rx_dropped_pct",rx_dropped_pct);
+            field_from_json(Obj,"tx_dropped_pct",tx_dropped_pct);
+            field_from_json(Obj,"rx_packets_bw",rx_packets_bw);
+            field_from_json(Obj,"tx_packets_bw",tx_packets_bw);
+            field_from_json(Obj,"rx_errors_pct",rx_errors_pct);
+            field_from_json(Obj,"tx_errors_pct",tx_errors_pct);
+
+            field_from_json(Obj,"tx_bytes_delta",tx_bytes_delta);
+            field_from_json(Obj,"rx_bytes_delta",rx_bytes_delta);
+            field_from_json(Obj,"rx_dropped_delta",rx_dropped_delta);
+            field_from_json(Obj,"tx_dropped_delta",tx_dropped_delta);
+            field_from_json(Obj,"rx_packets_delta",rx_packets_delta);
+            field_from_json(Obj,"tx_packets_delta",tx_packets_delta);
+            field_from_json(Obj,"rx_errors_delta",rx_errors_delta);
+            field_from_json(Obj,"tx_errors_delta",tx_errors_delta);
+
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void TIDstat_entry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"rx_msdu",rx_msdu);
+        field_to_json(Obj,"tx_msdu",tx_msdu);
+        field_to_json(Obj,"tx_msdu_failed",tx_msdu_failed);
+        field_to_json(Obj,"tx_msdu_retries",tx_msdu_retries);
+    }
+
+    bool TIDstat_entry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"rx_msdu",rx_msdu);
+            field_from_json(Obj,"tx_msdu",tx_msdu);
+            field_from_json(Obj,"tx_msdu_failed",tx_msdu_failed);
+            field_from_json(Obj,"tx_msdu_retries",tx_msdu_retries);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void RadioTimePoint::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"band",band);
+        field_to_json(Obj,"channel_width",channel_width);
+        field_to_json(Obj,"active_ms",active_ms);
+        field_to_json(Obj,"busy_ms",busy_ms);
+        field_to_json(Obj,"receive_ms",receive_ms);
+        field_to_json(Obj,"transmit_ms",transmit_ms);
+        field_to_json(Obj,"tx_power",tx_power);
+        field_to_json(Obj,"channel",channel);
+        field_to_json(Obj,"temperature",temperature);
+        field_to_json(Obj,"noise",noise);
+        field_to_json(Obj,"active_pct",active_pct);
+        field_to_json(Obj,"busy_pct",busy_pct);
+        field_to_json(Obj,"receive_pct",receive_pct);
+        field_to_json(Obj,"transmit_pct",transmit_pct);
+    }
+
+    bool RadioTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"band",band);
+            field_from_json(Obj,"channel_width",channel_width);
+            field_from_json(Obj,"active_ms",active_ms);
+            field_from_json(Obj,"busy_ms",busy_ms);
+            field_from_json(Obj,"receive_ms",receive_ms);
+            field_from_json(Obj,"transmit_ms",transmit_ms);
+            field_from_json(Obj,"tx_power",tx_power);
+            field_from_json(Obj,"channel",channel);
+            field_from_json(Obj,"temperature",temperature);
+            field_from_json(Obj,"noise",noise);
+            field_from_json(Obj,"active_pct",active_pct);
+            field_from_json(Obj,"busy_pct",busy_pct);
+            field_from_json(Obj,"receive_pct",receive_pct);
+            field_from_json(Obj,"transmit_pct",transmit_pct);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void AveragePoint::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"min",min);
+        field_to_json(Obj,"max",max);
+        field_to_json(Obj,"avg",avg);
+    }
+
+    bool AveragePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"min",min);
+            field_from_json(Obj,"max",max);
+            field_from_json(Obj,"avg",avg);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void SSIDTimePoint::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"bssid",bssid);
+        field_to_json(Obj,"mode",mode);
+        field_to_json(Obj,"ssid",ssid);
+        field_to_json(Obj,"band",band);
+        field_to_json(Obj,"channel",channel);
+        field_to_json(Obj,"associations",associations);
+        field_to_json(Obj,"tx_bytes_bw",tx_bytes_bw);
+        field_to_json(Obj,"rx_bytes_bw",rx_bytes_bw);
+        field_to_json(Obj,"tx_packets_bw",tx_packets_bw);
+        field_to_json(Obj,"rx_packets_bw",rx_packets_bw);
+        field_to_json(Obj,"tx_failed_pct",tx_failed_pct);
+        field_to_json(Obj,"tx_retries_pct",tx_retries_pct);
+        field_to_json(Obj,"tx_duration_pct",tx_duration_pct);
+    }
+
+    bool SSIDTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"bssid",bssid);
+            field_from_json(Obj,"mode",mode);
+            field_from_json(Obj,"ssid",ssid);
+            field_from_json(Obj,"band",band);
+            field_from_json(Obj,"channel",channel);
+            field_from_json(Obj,"associations",associations);
+            field_from_json(Obj,"tx_bytes_bw",tx_bytes_bw);
+            field_from_json(Obj,"rx_bytes_bw",rx_bytes_bw);
+            field_from_json(Obj,"tx_packets_bw",tx_packets_bw);
+            field_from_json(Obj,"rx_packets_bw",rx_packets_bw);
+            field_from_json(Obj,"tx_failed_pct",tx_failed_pct);
+            field_from_json(Obj,"tx_retries_pct",tx_retries_pct);
+            field_from_json(Obj,"tx_duration_pct",tx_duration_pct);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceTimePoint::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id",id);
+        field_to_json(Obj,"boardId",boardId);
+        field_to_json(Obj,"timestamp",timestamp);
+        field_to_json(Obj,"ap_data",ap_data);
+        field_to_json(Obj,"ssid_data",ssid_data);
+        field_to_json(Obj,"radio_data",radio_data);
+        field_to_json(Obj,"device_info",device_info);
+        field_to_json(Obj,"serialNumber",serialNumber);
+    }
+
+    bool DeviceTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id",id);
+            field_from_json(Obj,"boardId",boardId);
+            field_from_json(Obj,"timestamp",timestamp);
+            field_from_json(Obj,"ap_data",ap_data);
+            field_from_json(Obj,"ssid_data",ssid_data);
+            field_from_json(Obj,"radio_data",radio_data);
+            field_from_json(Obj,"device_info",device_info);
+            field_from_json(Obj,"serialNumber",serialNumber);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceTimePointAnalysis::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"noise",noise);
+        field_to_json(Obj,"temperature",temperature);
+        field_to_json(Obj,"active_pct",active_pct);
+        field_to_json(Obj,"busy_pct",busy_pct);
+        field_to_json(Obj,"receive_pct",receive_pct);
+        field_to_json(Obj,"transmit_pct",transmit_pct);
+        field_to_json(Obj,"tx_power",tx_power);
+        field_to_json(Obj,"tx_bytes_bw",tx_bytes_bw);
+        field_to_json(Obj,"rx_bytes_bw",rx_bytes_bw);
+        field_to_json(Obj,"rx_dropped_pct",rx_dropped_pct);
+        field_to_json(Obj,"tx_dropped_pct",tx_dropped_pct);
+        field_to_json(Obj,"rx_packets_bw",rx_packets_bw);
+        field_to_json(Obj,"tx_packets_bw",tx_packets_bw);
+        field_to_json(Obj,"rx_errors_pct",rx_errors_pct);
+        field_to_json(Obj,"tx_errors_pct",tx_errors_pct);
+    }
+
+    bool DeviceTimePointAnalysis::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"noise",noise);
+            field_from_json(Obj,"temperature",temperature);
+            field_from_json(Obj,"active_pct",active_pct);
+            field_from_json(Obj,"busy_pct",busy_pct);
+            field_from_json(Obj,"receive_pct",receive_pct);
+            field_from_json(Obj,"transmit_pct",transmit_pct);
+            field_from_json(Obj,"tx_power",tx_power);
+            field_from_json(Obj,"tx_bytes_bw",tx_bytes_bw);
+            field_from_json(Obj,"rx_bytes_bw",rx_bytes_bw);
+            field_from_json(Obj,"rx_dropped_pct",rx_dropped_pct);
+            field_from_json(Obj,"tx_dropped_pct",tx_dropped_pct);
+            field_from_json(Obj,"rx_packets_bw",rx_packets_bw);
+            field_from_json(Obj,"tx_packets_bw",tx_packets_bw);
+            field_from_json(Obj,"rx_errors_pct",rx_errors_pct);
+            field_from_json(Obj,"tx_errors_pct",tx_errors_pct);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceTimePointList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"points",points);
+        field_to_json(Obj,"stats",stats);
+    }
+
+    bool DeviceTimePointList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"points",points);
+            field_from_json(Obj,"stats",stats);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceTimePointStats::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"firstPoint",firstPoint);
+        field_to_json(Obj,"lastPoint",lastPoint);
+        field_to_json(Obj,"count",count);
+    }
+
+    bool DeviceTimePointStats::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"firstPoint",firstPoint);
+            field_from_json(Obj,"lastPoint",lastPoint);
+            field_from_json(Obj,"count",count);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void WifiClientRate::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"bitrate",bitrate);
+        field_to_json(Obj,"chwidth",chwidth);
+        field_to_json(Obj,"mcs",mcs);
+        field_to_json(Obj,"nss",nss);
+        field_to_json(Obj,"vht",vht);
+    }
+
+    bool WifiClientRate::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"bitrate",bitrate);
+            field_from_json(Obj,"chwidth",chwidth);
+            field_from_json(Obj,"mcs",mcs);
+            field_from_json(Obj,"nss",nss);
+            field_from_json(Obj,"vht",vht);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void WifiClientHistory::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"timestamp",timestamp);
+        field_to_json(Obj,"station_id",station_id);
+        field_to_json(Obj,"bssid",bssid);
+        field_to_json(Obj,"ssid",ssid);
+        field_to_json(Obj,"rssi",rssi);
+        field_to_json(Obj,"rx_bitrate",rx_bitrate);
+        field_to_json(Obj,"rx_chwidth",rx_chwidth);
+        field_to_json(Obj,"rx_mcs",rx_mcs);
+        field_to_json(Obj,"rx_nss",rx_nss);
+        field_to_json(Obj,"rx_vht",rx_vht);
+        field_to_json(Obj,"tx_bitrate",tx_bitrate);
+        field_to_json(Obj,"tx_chwidth",tx_chwidth);
+        field_to_json(Obj,"tx_mcs",tx_mcs);
+        field_to_json(Obj,"tx_nss",tx_nss);
+        field_to_json(Obj,"tx_vht",tx_vht);
+        field_to_json(Obj,"rx_bytes",rx_bytes);
+        field_to_json(Obj,"tx_bytes",tx_bytes);
+        field_to_json(Obj,"rx_duration",rx_duration);
+        field_to_json(Obj,"tx_duration",tx_duration);
+        field_to_json(Obj,"rx_packets",rx_packets);
+        field_to_json(Obj,"tx_packets",tx_packets);
+        field_to_json(Obj,"ipv4",ipv4);
+        field_to_json(Obj,"ipv6",ipv6);
+        field_to_json(Obj,"channel_width",channel_width);
+        field_to_json(Obj,"noise",noise);
+        field_to_json(Obj,"tx_power",tx_power);
+        field_to_json(Obj,"channel",channel);
+        field_to_json(Obj,"active_ms",active_ms);
+        field_to_json(Obj,"busy_ms",busy_ms);
+        field_to_json(Obj,"receive_ms",receive_ms);
+        field_to_json(Obj,"mode",mode);
+        field_to_json(Obj,"ack_signal",ack_signal);
+        field_to_json(Obj,"ack_signal_avg",ack_signal_avg);
+        field_to_json(Obj,"connected",connected);
+        field_to_json(Obj,"inactive",inactive);
+        field_to_json(Obj,"tx_retries",tx_retries);
+        field_to_json(Obj,"venue_id",venue_id);
+    }
+
+    bool WifiClientHistory::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"timestamp",timestamp);
+            field_from_json(Obj,"station_id",station_id);
+            field_from_json(Obj,"bssid",bssid);
+            field_from_json(Obj,"ssid",ssid);
+            field_from_json(Obj,"rssi",rssi);
+            field_from_json(Obj,"rx_bitrate",rx_bitrate);
+            field_from_json(Obj,"rx_chwidth",rx_chwidth);
+            field_from_json(Obj,"rx_mcs",rx_mcs);
+            field_from_json(Obj,"rx_nss",rx_nss);
+            field_from_json(Obj,"rx_vht",rx_vht);
+            field_from_json(Obj,"tx_bitrate",tx_bitrate);
+            field_from_json(Obj,"tx_chwidth",tx_chwidth);
+            field_from_json(Obj,"tx_mcs",tx_mcs);
+            field_from_json(Obj,"tx_nss",tx_nss);
+            field_from_json(Obj,"tx_vht",tx_vht);
+            field_from_json(Obj,"rx_bytes",rx_bytes);
+            field_from_json(Obj,"tx_bytes",tx_bytes);
+            field_from_json(Obj,"rx_duration",rx_duration);
+            field_from_json(Obj,"tx_duration",tx_duration);
+            field_from_json(Obj,"rx_packets",rx_packets);
+            field_from_json(Obj,"tx_packets",tx_packets);
+            field_from_json(Obj,"ipv4",ipv4);
+            field_from_json(Obj,"ipv6",ipv6);
+            field_from_json(Obj,"channel_width",channel_width);
+            field_from_json(Obj,"noise",noise);
+            field_from_json(Obj,"tx_power",tx_power);
+            field_from_json(Obj,"channel",channel);
+            field_from_json(Obj,"active_ms",active_ms);
+            field_from_json(Obj,"busy_ms",busy_ms);
+            field_from_json(Obj,"receive_ms",receive_ms);
+            field_from_json(Obj,"mode",mode);
+            field_from_json(Obj,"ack_signal",ack_signal);
+            field_from_json(Obj,"ack_signal_avg",ack_signal_avg);
+            field_from_json(Obj,"connected",connected);
+            field_from_json(Obj,"inactive",inactive);
+            field_from_json(Obj,"tx_retries",tx_retries);
+            field_from_json(Obj,"venue_id",venue_id);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+}

src/RESTObjects/RESTAPI_AnalyticsObjects.h

@@ -0,0 +1,422 @@
+//
+// Created by stephane bourque on 2022-01-10.
+//
+
+#pragma once
+
+#include "RESTAPI_ProvObjects.h"
+#include <vector>
+
+namespace OpenWifi {
+
+    namespace AnalyticsObjects {
+
+        struct Report {
+            uint64_t snapShot = 0;
+
+            void reset();
+
+            void to_json(Poco::JSON::Object &Obj) const;
+        };
+
+        struct VenueInfo {
+            OpenWifi::Types::UUID_t id;
+            std::string name;
+            std::string description;
+            uint64_t retention = 0;
+            uint64_t interval = 0;
+            bool monitorSubVenues = false;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct BoardInfo {
+            ProvObjects::ObjectInfo info;
+            std::vector<VenueInfo> venueList;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+
+            inline bool operator<(const BoardInfo &bb) const {
+                return info.id < bb.info.id;
+            }
+
+            inline bool operator==(const BoardInfo &bb) const {
+                return info.id == bb.info.id;
+            }
+        };
+
+        struct DeviceInfo {
+            std::string boardId;
+            std::string type;
+            std::string serialNumber;
+            std::string deviceType;
+            uint64_t lastContact = 0 ;
+            uint64_t lastPing = 0;
+            uint64_t lastState = 0;
+            std::string lastFirmware;
+            uint64_t lastFirmwareUpdate = 0;
+            uint64_t lastConnection = 0;
+            uint64_t lastDisconnection = 0;
+            uint64_t pings = 0;
+            uint64_t states = 0;
+            bool connected = false;
+            std::string connectionIp;
+            uint64_t associations_2g = 0;
+            uint64_t associations_5g = 0;
+            uint64_t associations_6g = 0;
+            uint64_t health = 0;
+            uint64_t lastHealth = 0;
+            std::string locale;
+            uint64_t uptime = 0;
+            double memory = 0.0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct DeviceInfoList {
+            std::vector<DeviceInfo> devices;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        enum wifi_band {
+            band_2g = 0, band_5g = 1, band_6g = 2
+        };
+
+        struct TIDstat_entry {
+            uint64_t rx_msdu = 0,
+                    tx_msdu = 0,
+                    tx_msdu_failed = 0,
+                    tx_msdu_retries = 0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct UE_rate {
+            uint64_t    bitrate=0;
+            uint64_t    mcs=0;
+            uint64_t    nss=0;
+            bool        ht=false;
+            bool        sgi=false;
+            uint64_t    chwidth=0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct AveragePoint {
+            double      min = 0.0,
+                        max = 0.0,
+                        avg = 0.0;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct UETimePoint {
+            std::string station;
+            int64_t rssi = 0;
+            uint64_t tx_bytes = 0,
+                    rx_bytes = 0,
+                    tx_duration = 0,
+                    rx_packets = 0,
+                    tx_packets = 0,
+                    tx_retries = 0,
+                    tx_failed = 0,
+                    connected = 0,
+                    inactive = 0;
+
+            double  tx_bytes_bw = 0.0 ,
+                    rx_bytes_bw = 0.0 ,
+                    tx_packets_bw = 0.0 ,
+                    rx_packets_bw = 0.0 ,
+                    tx_failed_pct = 0.0 ,
+                    tx_retries_pct = 0.0 ,
+                    tx_duration_pct = 0.0;
+
+            uint64_t    tx_bytes_delta = 0,
+                        rx_bytes_delta = 0,
+                        tx_duration_delta = 0,
+                        rx_packets_delta = 0,
+                        tx_packets_delta = 0,
+                        tx_retries_delta = 0,
+                        tx_failed_delta = 0;
+
+            UE_rate tx_rate,
+                    rx_rate;
+            std::vector<TIDstat_entry> tidstats;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        enum SSID_MODES {
+            unknown = 0,
+            ap,
+            mesh,
+            sta,
+            wds_ap,
+            wds_sta,
+            wds_repeater
+        };
+
+        inline SSID_MODES SSID_Mode(const std::string &m) {
+            if (m == "ap")
+                return ap;
+            if (m == "sta")
+                return sta;
+            if (m == "mesh")
+                return mesh;
+            if (m == "wds-ap")
+                return wds_ap;
+            if (m == "wds-sta")
+                return wds_sta;
+            if (m == "wds-repeater")
+                return wds_repeater;
+            return unknown;
+        }
+
+        struct SSIDTimePoint {
+            std::string bssid,
+                        mode,
+                        ssid;
+            uint64_t    band=0,
+                        channel=0;
+            std::vector<UETimePoint> associations;
+
+            AveragePoint    tx_bytes_bw,
+                            rx_bytes_bw,
+                            tx_packets_bw,
+                            rx_packets_bw,
+                            tx_failed_pct,
+                            tx_retries_pct,
+                            tx_duration_pct;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+
+        struct APTimePoint {
+            uint64_t    collisions = 0,
+                        multicast = 0,
+                        rx_bytes = 0,
+                        rx_dropped = 0,
+                        rx_errors = 0,
+                        rx_packets = 0,
+                        tx_bytes = 0,
+                        tx_dropped = 0,
+                        tx_errors = 0,
+                        tx_packets = 0;
+
+            double      tx_bytes_bw = 0.0 ,
+                        rx_bytes_bw = 0.0 ,
+                        rx_dropped_pct = 0.0,
+                        tx_dropped_pct = 0.0,
+                        rx_packets_bw = 0.0,
+                        tx_packets_bw = 0.0,
+                        rx_errors_pct = 0.0 ,
+                        tx_errors_pct = 0.0;
+
+            uint64_t    tx_bytes_delta = 0,
+                        rx_bytes_delta = 0 ,
+                        rx_dropped_delta = 0,
+                        tx_dropped_delta = 0,
+                        rx_packets_delta = 0,
+                        tx_packets_delta = 0,
+                        rx_errors_delta = 0,
+                        tx_errors_delta = 0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct RadioTimePoint {
+            uint64_t    band = 0,
+                        channel_width = 0;
+            uint64_t    active_ms = 0,
+                        busy_ms = 0,
+                        receive_ms = 0,
+                        transmit_ms = 0,
+                        tx_power = 0,
+                        channel = 0;
+            int64_t     temperature = 0,
+                        noise = 0;
+
+            double      active_pct = 0.0 ,
+                        busy_pct = 0.0,
+                        receive_pct = 0.0,
+                        transmit_pct = 0.0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+
+        struct DeviceTimePoint {
+            std::string                     id;
+            std::string                     boardId;
+            uint64_t                        timestamp = 0;
+            APTimePoint                     ap_data;
+            std::vector<SSIDTimePoint>      ssid_data;
+            std::vector<RadioTimePoint>     radio_data;
+            AnalyticsObjects::DeviceInfo    device_info;
+            std::string                     serialNumber;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+
+            inline bool operator<(const DeviceTimePoint &rhs) const {
+                if(timestamp < rhs.timestamp)
+                    return true;
+                if(timestamp > rhs.timestamp)
+                    return false;
+                if(device_info.serialNumber < rhs.device_info.serialNumber)
+                    return true;
+                return false;
+            }
+
+            inline bool operator==(const DeviceTimePoint &rhs) const {
+                return timestamp==rhs.timestamp && device_info.serialNumber==rhs.device_info.serialNumber;
+            }
+
+            inline bool operator>(const DeviceTimePoint &rhs) const {
+                if(timestamp > rhs.timestamp)
+                    return true;
+                if(timestamp < rhs.timestamp)
+                    return false;
+                if(device_info.serialNumber > rhs.device_info.serialNumber)
+                    return true;
+                return false;
+            }
+
+        };
+
+        struct DeviceTimePointAnalysis {
+            uint64_t        timestamp;
+
+            AveragePoint    noise;
+            AveragePoint    temperature;
+            AveragePoint    active_pct;
+            AveragePoint    busy_pct;
+            AveragePoint    receive_pct;
+            AveragePoint    transmit_pct;
+            AveragePoint    tx_power;
+
+            AveragePoint    tx_bytes_bw;
+            AveragePoint    rx_bytes_bw;
+            AveragePoint    rx_dropped_pct;
+            AveragePoint    tx_dropped_pct;
+            AveragePoint    rx_packets_bw;
+            AveragePoint    tx_packets_bw;
+            AveragePoint    rx_errors_pct;
+            AveragePoint    tx_errors_pct;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+
+        };
+
+        struct DeviceTimePointList {
+            std::vector<DeviceTimePoint>            points;
+            std::vector<DeviceTimePointAnalysis>    stats;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct BandwidthAnalysisEntry {
+            uint64_t    timestamp = 0;
+
+        };
+
+        struct BandwidthAnalysis {
+
+        };
+
+        struct AverageValueSigned {
+            int64_t     peak=0, avg=0, low=0;
+        };
+
+        struct AverageValueUnsigned {
+            uint64_t     peak=0, avg=0, low=0;
+        };
+
+        struct RadioAnalysis {
+            uint64_t                timestamp=0;
+            AverageValueSigned      noise, temperature;
+            AverageValueUnsigned    active_ms,
+                                    busy_ms,
+                                    transmit_ms,
+                                    receive_ms;
+        };
+
+        struct DeviceTimePointStats {
+            uint64_t                firstPoint=0;
+            uint64_t                lastPoint=0;
+            uint64_t                count=0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct WifiClientRate {
+            uint32_t    bitrate=0;
+            uint32_t    chwidth=0;
+            uint16_t    mcs=0;
+            uint16_t    nss=0;
+            bool        vht=false;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct WifiClientHistory {
+            uint64_t        timestamp=OpenWifi::Now();
+            std::string     station_id;
+            std::string     bssid;
+            std::string     ssid;
+            int64_t         rssi=0;
+            uint32_t        rx_bitrate=0;
+            uint32_t        rx_chwidth=0;
+            uint16_t        rx_mcs=0;
+            uint16_t        rx_nss=0;
+            bool            rx_vht=false;
+            uint32_t        tx_bitrate=0;
+            uint32_t        tx_chwidth=0;
+            uint16_t        tx_mcs=0;
+            uint16_t        tx_nss=0;
+            bool            tx_vht=false;
+            uint64_t        rx_bytes=0;
+            uint64_t        tx_bytes=0;
+            uint64_t        rx_duration=0;
+            uint64_t        tx_duration=0;
+            uint64_t        rx_packets=0;
+            uint64_t        tx_packets=0;
+            std::string     ipv4;
+            std::string     ipv6;
+            uint64_t        channel_width=0;
+            int64_t         noise=0;
+            uint64_t        tx_power=0;
+            uint64_t        channel=0;
+            uint64_t        active_ms=0;
+            uint64_t        busy_ms=0;
+            uint64_t        receive_ms=0;
+            std::string     mode;
+            int64_t         ack_signal=0;
+            int64_t         ack_signal_avg=0;
+            uint64_t        connected=0;
+            uint64_t        inactive=0;
+            uint64_t        tx_retries=0;
+            std::string     venue_id;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+    }
+
+}

src/RESTObjects/RESTAPI_CertObjects.cpp

@@ -0,0 +1,208 @@
+//
+// Created by stephane bourque on 2021-12-07.
+//
+
+#include "RESTAPI_CertObjects.h"
+#include "framework/MicroService.h"
+
+using OpenWifi::RESTAPI_utils::field_to_json;
+using OpenWifi::RESTAPI_utils::field_from_json;
+
+namespace OpenWifi::CertObjects {
+    void CertificateEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id", id);
+        field_to_json(Obj,"entity", entity);
+        field_to_json(Obj,"creator", creator);
+        field_to_json(Obj,"type", type);
+        field_to_json(Obj,"status", status);
+        field_to_json(Obj,"certificate", certificate);
+        field_to_json(Obj,"key", key);
+        field_to_json(Obj,"devid", devid);
+        field_to_json(Obj,"cas", cas);
+        field_to_json(Obj,"manufacturer", manufacturer);
+        field_to_json(Obj,"model", model);
+        field_to_json(Obj,"redirector", redirector);
+        field_to_json(Obj,"commonName", commonName);
+        field_to_json(Obj,"certificateId", certificateId);
+        field_to_json(Obj,"batch", batch);
+        field_to_json(Obj,"created", created);
+        field_to_json(Obj,"modified", modified);
+        field_to_json(Obj,"revoked", revoked);
+        field_to_json(Obj,"revokeCount", revokeCount);
+        field_to_json(Obj,"synched", synched);
+    }
+
+    bool CertificateEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id", id);
+            field_from_json(Obj,"entity", entity);
+            field_from_json(Obj,"creator", creator);
+            field_from_json(Obj,"type", type);
+            field_from_json(Obj,"status", status);
+            field_from_json(Obj,"certificate", certificate);
+            field_from_json(Obj,"key", key);
+            field_from_json(Obj,"devid", devid);
+            field_from_json(Obj,"cas", cas);
+            field_from_json(Obj,"manufacturer", manufacturer);
+            field_from_json(Obj,"model", model);
+            field_from_json(Obj,"redirector", redirector);
+            field_from_json(Obj,"commonName", commonName);
+            field_from_json(Obj,"certificateId", certificateId);
+            field_from_json(Obj,"batch", batch);
+            field_from_json(Obj,"created", created);
+            field_from_json(Obj,"modified", modified);
+            field_from_json(Obj,"revoked", revoked);
+            field_from_json(Obj,"revokeCount", revokeCount);
+            field_from_json(Obj,"synched", synched);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void EntityEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id", id);
+        field_to_json(Obj,"creator", creator);
+        field_to_json(Obj,"name", name);
+        field_to_json(Obj,"description", description);
+        field_to_json(Obj,"defaultRedirector", defaultRedirector);
+        field_to_json(Obj,"apiKey", apiKey);
+        field_to_json(Obj,"serverEnrollmentProfile", serverEnrollmentProfile);
+        field_to_json(Obj,"clientEnrollmentProfile", clientEnrollmentProfile);
+        field_to_json(Obj,"organization", organization);
+        field_to_json(Obj,"created", created);
+        field_to_json(Obj,"modified", modified);
+        field_to_json(Obj,"suspended", suspended);
+        field_to_json(Obj,"deleted", deleted);
+        field_to_json(Obj,"notes", notes);
+    }
+
+    bool EntityEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id", id);
+            field_from_json(Obj,"creator", creator);
+            field_from_json(Obj,"name", name);
+            field_from_json(Obj,"description", description);
+            field_from_json(Obj,"defaultRedirector", defaultRedirector);
+            field_from_json(Obj,"apiKey", apiKey);
+            field_from_json(Obj,"serverEnrollmentProfile", serverEnrollmentProfile);
+            field_from_json(Obj,"clientEnrollmentProfile", clientEnrollmentProfile);
+            field_from_json(Obj,"organization", organization);
+            field_from_json(Obj,"created", created);
+            field_from_json(Obj,"modified", modified);
+            field_from_json(Obj,"suspended", suspended);
+            field_from_json(Obj,"deleted", deleted);
+            field_from_json(Obj,"notes", notes);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void BatchEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id", id);
+        field_to_json(Obj,"entity", entity);
+        field_to_json(Obj,"creator", creator);
+        field_to_json(Obj,"name", name);
+        field_to_json(Obj,"description", description);
+        field_to_json(Obj,"manufacturer", manufacturer);
+        field_to_json(Obj,"model", model);
+        field_to_json(Obj,"redirector", redirector);
+        field_to_json(Obj,"commonNames", commonNames);
+        field_to_json(Obj,"jobHistory", jobHistory);
+        field_to_json(Obj,"notes", notes);
+        field_to_json(Obj,"submitted", submitted);
+        field_to_json(Obj,"started", started);
+        field_to_json(Obj,"completed", completed);
+        field_to_json(Obj,"modified", modified);
+    }
+
+    bool BatchEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id", id);
+            field_from_json(Obj,"entity", entity);
+            field_from_json(Obj,"creator", creator);
+            field_from_json(Obj,"name", name);
+            field_from_json(Obj,"description", description);
+            field_from_json(Obj,"manufacturer", manufacturer);
+            field_from_json(Obj,"model", model);
+            field_from_json(Obj,"redirector", redirector);
+            field_from_json(Obj,"commonNames", commonNames);
+            field_from_json(Obj,"jobHistory", jobHistory);
+            field_from_json(Obj,"notes", notes);
+            field_from_json(Obj,"submitted", submitted);
+            field_from_json(Obj,"started", started);
+            field_from_json(Obj,"completed", completed);
+            field_from_json(Obj,"modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void JobEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id", id);
+        field_to_json(Obj,"entity", entity);
+        field_to_json(Obj,"creator", creator);
+        field_to_json(Obj,"batch", batch);
+        field_to_json(Obj,"commonNames", commonNames);
+        field_to_json(Obj,"completedNames", completedNames);
+        field_to_json(Obj,"errorNames", errorNames);
+        field_to_json(Obj,"status", status);
+        field_to_json(Obj,"command", command);
+        field_to_json(Obj,"parameters", parameters);
+        field_to_json(Obj,"submitted", submitted);
+        field_to_json(Obj,"started", started);
+        field_to_json(Obj,"completed", completed);
+    }
+
+    bool JobEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id", id);
+            field_from_json(Obj,"entity", entity);
+            field_from_json(Obj,"creator", creator);
+            field_from_json(Obj,"batch", batch);
+            field_from_json(Obj,"commonNames", commonNames);
+            field_from_json(Obj,"completedNames", completedNames);
+            field_from_json(Obj,"errorNames", errorNames);
+            field_from_json(Obj,"status", status);
+            field_from_json(Obj,"command", command);
+            field_from_json(Obj,"parameters", parameters);
+            field_from_json(Obj,"submitted", submitted);
+            field_from_json(Obj,"started", started);
+            field_from_json(Obj,"completed", completed);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void DashBoardYearlyStats::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "year", year);
+        field_to_json(Obj, "activeCerts", activeCerts);
+        field_to_json(Obj, "revokedCerts", revokedCerts);
+    }
+
+    void Dashboard::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"snapshot", snapshot);
+        field_to_json(Obj,"numberOfIssuedCerts", numberOfIssuedCerts);
+        field_to_json(Obj,"numberOfRevokedCerts", numberOfRevokedCerts);
+        field_to_json(Obj,"activeCertsPerOrganization", activeCertsPerOrganization);
+        field_to_json(Obj,"revokedCertsPerOrganization", revokedCertsPerOrganization);
+        field_to_json(Obj,"numberOfRedirectors", numberOfRedirectors);
+        field_to_json(Obj,"deviceTypes", deviceTypes);
+        field_to_json(Obj,"monthlyNumberOfCerts", monthlyNumberOfCerts);
+        field_to_json(Obj,"monthlyNumberOfCertsPerOrgPerYear", monthlyNumberOfCertsPerOrgPerYear);
+    }
+
+    void Dashboard::reset() {
+        snapshot=0;
+        numberOfRevokedCerts = numberOfIssuedCerts = 0;
+        activeCertsPerOrganization.clear();
+        revokedCertsPerOrganization.clear();
+        numberOfRedirectors.clear();
+        deviceTypes.clear();
+        monthlyNumberOfCerts.clear();
+        monthlyNumberOfCertsPerOrgPerYear.clear();
+    }
+}

src/RESTObjects/RESTAPI_CertObjects.h

@@ -0,0 +1,122 @@
+//
+// Created by stephane bourque on 2021-12-07.
+//
+
+#pragma once
+
+#include <string>
+#include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_SecurityObjects.h"
+
+namespace OpenWifi::CertObjects {
+
+    struct CertificateEntry {
+        OpenWifi::Types::UUID_t         id;
+        OpenWifi::Types::UUID_t         entity;
+        OpenWifi::Types::UUID_t         creator;
+        std::string                     type;
+        std::string                     status;
+        std::string                     certificate;
+        std::string                     key;
+        std::string                     devid;
+        std::string                     cas;
+        std::string                     manufacturer;
+        std::string                     model;
+        std::string                     redirector;
+        std::string                     commonName;
+        std::string                     certificateId;
+        OpenWifi::Types::UUID_t         batch;
+        uint64_t                        created = 0;
+        uint64_t                        modified = 0;
+        uint64_t                        revoked = 0;
+        uint64_t                        revokeCount = 0;
+        uint64_t                        synched = 0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct EntityEntry {
+        OpenWifi::Types::UUID_t         id;
+        OpenWifi::Types::UUID_t         creator;
+        std::string                     name;
+        std::string                     description;
+        std::string                     defaultRedirector;
+        std::string                     apiKey;
+        std::string                     serverEnrollmentProfile;
+        std::string                     clientEnrollmentProfile;
+        std::string                     organization;
+        SecurityObjects::NoteInfoVec    notes;
+        bool                            suspended=false;
+        bool                            deleted=false;
+        uint64_t                        created = 0 ;
+        uint64_t                        modified = 0 ;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct BatchEntry {
+        OpenWifi::Types::UUID_t         id;
+        OpenWifi::Types::UUID_t         entity;
+        OpenWifi::Types::UUID_t         creator;
+        std::string                     name;
+        std::string                     description;
+        std::string                     manufacturer;
+        std::string                     model;
+        std::string                     redirector;
+        std::vector<std::string>        commonNames;
+        std::vector<std::string>        jobHistory;
+        SecurityObjects::NoteInfoVec    notes;
+        uint64_t                        submitted = 0 ;
+        uint64_t                        started = 0 ;
+        uint64_t                        completed = 0 ;
+        uint64_t                        modified = 0 ;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct JobEntry {
+        OpenWifi::Types::UUID_t         id;
+        OpenWifi::Types::UUID_t         entity;
+        OpenWifi::Types::UUID_t         creator;
+        OpenWifi::Types::UUID_t         batch;
+        std::string                     command;
+        OpenWifi::Types::StringVec      commonNames;
+        OpenWifi::Types::StringVec      completedNames;
+        OpenWifi::Types::StringVec      errorNames;
+        Types::StringPairVec            parameters;
+        std::string                     status;
+        uint64_t                        submitted=0;
+        uint64_t                        started=0;
+        uint64_t                        completed=0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct DashBoardYearlyStats {
+        uint64_t                            year=0;
+        OpenWifi::Types::Counted3DMapSII    activeCerts;
+        OpenWifi::Types::Counted3DMapSII    revokedCerts;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+    };
+
+    struct Dashboard {
+        uint64_t                            snapshot=0;
+        uint64_t                            numberOfIssuedCerts=0;
+        uint64_t                            numberOfRevokedCerts=0;
+        OpenWifi::Types::CountedMap         activeCertsPerOrganization;
+        OpenWifi::Types::CountedMap         revokedCertsPerOrganization;
+        OpenWifi::Types::CountedMap         numberOfRedirectors;
+        OpenWifi::Types::CountedMap         deviceTypes;
+        OpenWifi::Types::CountedMap         monthlyNumberOfCerts;
+        std::vector<DashBoardYearlyStats>   monthlyNumberOfCertsPerOrgPerYear;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        void reset();
+    };
+
+}

src/RESTObjects/RESTAPI_FMSObjects.cpp

@@ -3,7 +3,7 @@
 //
 
 #include "RESTAPI_FMSObjects.h"
-#include "RESTAPI_utils.h"
+#include "framework/MicroService.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -233,10 +233,10 @@ namespace OpenWifi::FMSObjects {
         UnknownFirmwares_.clear();
         totalSecondsOld_.clear();
         numberOfDevices = 0 ;
-        snapshot = std::time(nullptr);
+        snapshot = OpenWifi::Now();
     }
 
-    bool DeviceReport::from_json(const Poco::JSON::Object::Ptr &Obj) {
+    bool DeviceReport::from_json([[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) {
         try {
 
             return true;
@@ -245,4 +245,65 @@ namespace OpenWifi::FMSObjects {
         }
         return false;
     }
+
+    void DeviceInformation::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "serialNumber",serialNumber);
+        field_to_json(Obj, "history", history);
+        field_to_json(Obj, "currentFirmware", currentFirmware);
+        field_to_json(Obj, "currentFirmwareDate", currentFirmwareDate);
+        field_to_json(Obj, "latestFirmware", latestFirmware);
+        field_to_json(Obj, "latestFirmwareDate", latestFirmwareDate);
+        field_to_json(Obj, "latestFirmwareAvailable",latestFirmwareAvailable);
+        field_to_json(Obj, "latestFirmwareURI",latestFirmwareURI);
+    }
+
+    bool DeviceInformation::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "serialNumber",serialNumber);
+            field_from_json(Obj, "history", history);
+            field_from_json(Obj, "currentFirmware", currentFirmware);
+            field_from_json(Obj, "currentFirmwareDate", currentFirmwareDate);
+            field_from_json(Obj, "latestFirmware", latestFirmware);
+            field_from_json(Obj, "latestFirmwareDate", latestFirmwareDate);
+            field_from_json(Obj, "latestFirmwareAvailable",latestFirmwareAvailable);
+            field_from_json(Obj, "latestFirmwareURI",latestFirmwareURI);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceCurrentInfo::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "serialNumber",serialNumber);
+        field_to_json(Obj, "revision", revision);
+        field_to_json(Obj, "upgraded", upgraded);
+    }
+
+    bool DeviceCurrentInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "serialNumber",serialNumber);
+            field_from_json(Obj, "revision", revision);
+            field_from_json(Obj, "upgraded", upgraded);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceCurrentInfoList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "devices",devices);
+    }
+
+    bool DeviceCurrentInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "devices",devices);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
 }

src/RESTObjects/RESTAPI_FMSObjects.h

@@ -4,12 +4,10 @@
 
 #include <string>
 
-#ifndef UCENTRALFMS_RESTAPI_FMSOBJECTS_H
-#define UCENTRALFMS_RESTAPI_FMSOBJECTS_H
-
+#pragma once
 
 #include "RESTAPI_SecurityObjects.h"
-#include "OpenWifiTypes.h"
+#include "framework/OpenWifiTypes.h"
 
 namespace OpenWifi::FMSObjects {
 
@@ -127,7 +125,35 @@ namespace OpenWifi::FMSObjects {
         void reset();
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
+
+    struct DeviceInformation {
+        std::string                 serialNumber;
+        RevisionHistoryEntryList    history;
+        std::string                 currentFirmware;
+        uint64_t                    currentFirmwareDate=0;
+        std::string                 latestFirmware;
+        uint64_t                    latestFirmwareDate=0;
+        bool                        latestFirmwareAvailable;
+        std::string                 latestFirmwareURI;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct DeviceCurrentInfo {
+        std::string                 serialNumber;
+        std::string                 revision;
+        uint64_t                    upgraded=0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct DeviceCurrentInfoList {
+        std::vector<DeviceCurrentInfo>  devices;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
 }
-
-
-#endif //UCENTRALFMS_RESTAPI_FMSOBJECTS_H

src/RESTObjects/RESTAPI_GWobjects.cpp

@@ -12,12 +12,11 @@
 #include "Daemon.h"
 #ifdef	TIP_GATEWAY_SERVICE
 #include "DeviceRegistry.h"
+#include "CapabilitiesCache.h"
 #endif
 
 #include "RESTAPI_GWobjects.h"
-#include "RESTAPI_handler.h"
-#include "RESTAPI_utils.h"
-#include "Utils.h"
+#include "framework/MicroService.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -28,7 +27,7 @@ namespace OpenWifi::GWObjects {
 	void Device::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
-		field_to_json(Obj,"deviceType", uCentral::Daemon::instance()->IdentifyDevice(Compatible));
+		field_to_json(Obj,"deviceType", CapabilitiesCache::instance()->GetPlatform(Compatible));
 #endif
 		field_to_json(Obj,"macAddress", MACAddress);
 		field_to_json(Obj,"manufacturer", Manufacturer);
@@ -46,6 +45,10 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"compatible", Compatible);
 		field_to_json(Obj,"fwUpdatePolicy", FWUpdatePolicy);
 		field_to_json(Obj,"devicePassword", DevicePassword);
+		field_to_json(Obj,"subscriber", subscriber);
+		field_to_json(Obj,"entity", entity);
+		field_to_json(Obj,"modified", modified);
+		field_to_json(Obj,"locale", locale);
 	}
 
 	void Device::to_json_with_status(Poco::JSON::Object &Obj) const {
@@ -70,7 +73,7 @@ namespace OpenWifi::GWObjects {
 #endif
 	}
 
-	bool Device::from_json(Poco::JSON::Object::Ptr Obj) {
+	bool Device::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"serialNumber",SerialNumber);
 			field_from_json(Obj,"deviceType",DeviceType);
@@ -82,6 +85,9 @@ namespace OpenWifi::GWObjects {
 			field_from_json(Obj,"location",Location);
 			field_from_json(Obj,"venue",Venue);
 			field_from_json(Obj,"compatible",Compatible);
+			field_from_json(Obj,"subscriber", subscriber);
+			field_from_json(Obj,"entity", entity);
+			field_from_json(Obj,"locale", locale);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -147,9 +153,10 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"custom", Custom);
 		field_to_json(Obj,"waitingForFile", WaitingForFile);
 		field_to_json(Obj,"attachFile", AttachDate);
+		field_to_json(Obj,"executionTime", executionTime);
 	}
 
-	bool DefaultConfiguration::from_json(Poco::JSON::Object::Ptr Obj) {
+	bool DefaultConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"name",Name);
 			field_from_json(Obj,"configuration",Configuration);
@@ -162,14 +169,25 @@ namespace OpenWifi::GWObjects {
 	}
 
 	void BlackListedDevice::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"serialNumber", SerialNumber);
-		field_to_json(Obj,"author", Author);
-		field_to_json(Obj,"reason", Reason);
-		field_to_json(Obj,"created", Created);
+		field_to_json(Obj,"serialNumber", serialNumber);
+		field_to_json(Obj,"author", author);
+		field_to_json(Obj,"reason", reason);
+		field_to_json(Obj,"created", created);
+	}
+
+	bool BlackListedDevice::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj,"serialNumber",serialNumber);
+			field_from_json(Obj,"author",author);
+			field_from_json(Obj,"reason",reason);
+			field_from_json(Obj,"created",created);
+			return true;
+		} catch (const Poco::Exception &E) {
+		}
+		return false;
 	}
 
 	void ConnectionState::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"serialNumber", SerialNumber);
 		field_to_json(Obj,"ipAddress", Address);
 		field_to_json(Obj,"txBytes", TX);
 		field_to_json(Obj,"rxBytes", RX);
@@ -180,6 +198,11 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"lastContact", LastContact);
 		field_to_json(Obj,"associations_2G", Associations_2G);
 		field_to_json(Obj,"associations_5G", Associations_5G);
+		field_to_json(Obj,"webSocketClients", webSocketClients);
+		field_to_json(Obj,"websocketPackets", websocketPackets);
+		field_to_json(Obj,"kafkaClients", kafkaClients);
+		field_to_json(Obj,"kafkaPackets", kafkaPackets);
+		field_to_json(Obj,"locale", locale);
 
 		switch(VerifiedCertificate) {
 			case NO_CERTIFICATE:
@@ -241,7 +264,108 @@ namespace OpenWifi::GWObjects {
 		lastContact.clear();
 		associations.clear();
 		numberOfDevices = 0 ;
-		snapshot = std::time(nullptr);
+		snapshot = OpenWifi::Now();
+	}
+
+	void CapabilitiesModel::to_json(Poco::JSON::Object &Obj) const{
+		field_to_json(Obj,"deviceType", deviceType);
+		field_to_json(Obj,"capabilities", capabilities);
+	};
+
+	void ScriptRequest::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"serialNumber",serialNumber);
+		field_to_json(Obj,"timeout",timeout);
+		field_to_json(Obj,"type",type);
+		field_to_json(Obj,"script",script);
+		field_to_json(Obj,"scriptId",scriptId);
+		field_to_json(Obj,"when",when);
+	}
+
+	bool ScriptRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj,"serialNumber",serialNumber);
+			field_from_json(Obj,"timeout",timeout);
+			field_from_json(Obj,"type",type);
+			field_from_json(Obj,"script",script);
+			field_from_json(Obj,"scriptId",scriptId);
+			field_from_json(Obj,"when",when);
+			return true;
+		} catch (const Poco::Exception &E) {
+		}
+		return false;
+
+	}
+
+	void RadiusProxyPoolList::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"pools",pools);
+	}
+
+	bool RadiusProxyPoolList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj,"pools",pools);
+			return true;
+		} catch (const Poco::Exception &E) {
+		}
+		return false;
+	}
+
+	void RadiusProxyPool::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"name",name);
+		field_to_json(Obj,"description",description);
+		field_to_json(Obj,"authConfig",authConfig);
+		field_to_json(Obj,"acctConfig",acctConfig);
+	}
+
+	bool RadiusProxyPool::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj,"name",name);
+			field_from_json(Obj,"description",description);
+			field_from_json(Obj,"authConfig",authConfig);
+			field_from_json(Obj,"acctConfig",acctConfig);
+			return true;
+		} catch (const Poco::Exception &E) {
+		}
+		return false;
+	}
+
+	void RadiusProxyServerConfig::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"policy",strategy);
+		field_to_json(Obj,"monitor",monitor);
+		field_to_json(Obj,"monitorMethod",monitorMethod);
+		field_to_json(Obj,"methodParameters",methodParameters);
+		field_to_json(Obj,"servers",servers);
+	}
+
+	bool RadiusProxyServerConfig::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj,"policy",strategy);
+			field_from_json(Obj,"monitor",monitor);
+			field_from_json(Obj,"monitorMethod",monitorMethod);
+			field_from_json(Obj,"methodParameters",methodParameters);
+			field_from_json(Obj,"servers",servers);
+			return true;
+		} catch (const Poco::Exception &E) {
+		}
+		return false;
+	}
+
+	void RadiusProxyServerEntry::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"name",name);
+		field_to_json(Obj,"ip",ip);
+		field_to_json(Obj,"port",port);
+		field_to_json(Obj,"weight",weight);
+	}
+
+	bool RadiusProxyServerEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+		try {
+			field_from_json(Obj,"name",name);
+			field_from_json(Obj,"ip",ip);
+			field_from_json(Obj,"port",port);
+			field_from_json(Obj,"weight",weight);
+			return true;
+		} catch (const Poco::Exception &E) {
+		}
+		return false;
 	}
 }
 

src/RESTObjects/RESTAPI_GWobjects.h

@@ -6,8 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-#ifndef UCENTRAL_RESTAPI_OBJECTS_H
-#define UCENTRAL_RESTAPI_OBJECTS_H
+#pragma once
 
 #include "Poco/JSON/Object.h"
 #include "RESTAPI_SecurityObjects.h"
@@ -23,7 +22,6 @@ namespace OpenWifi::GWObjects {
 
 	struct ConnectionState {
 		uint64_t MessageCount = 0 ;
-		std::string SerialNumber;
 		std::string Address;
 		uint64_t UUID = 0 ;
 		uint64_t PendingUUID = 0 ;
@@ -35,6 +33,11 @@ namespace OpenWifi::GWObjects {
 		std::string Firmware;
 		CertificateValidation VerifiedCertificate = NO_CERTIFICATE;
 		std::string Compatible;
+		uint64_t 	kafkaClients=0;
+		uint64_t 	webSocketClients=0;
+		uint64_t 	kafkaPackets=0;
+		uint64_t 	websocketPackets=0;
+		std::string locale;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
@@ -50,38 +53,45 @@ namespace OpenWifi::GWObjects {
 		std::string Firmware;
 		std::string Compatible;
 		std::string FWUpdatePolicy;
-		uint64_t UUID;
-		uint64_t CreationTimestamp;
-		uint64_t LastConfigurationChange;
-		uint64_t LastConfigurationDownload;
-		uint64_t LastFWUpdate;
+		uint64_t UUID = 0 ;
+		uint64_t CreationTimestamp = 0 ;
+		uint64_t LastConfigurationChange = 0 ;
+		uint64_t LastConfigurationDownload = 0 ;
+		uint64_t LastFWUpdate = 0 ;
 		std::string Venue;
 		std::string DevicePassword;
+		std::string subscriber;
+		std::string entity;
+		uint64_t 	modified=0;
+		std::string locale;
+
 		void to_json(Poco::JSON::Object &Obj) const;
 		void to_json_with_status(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr Obj);
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 		void Print() const;
 	};
 
 	struct Statistics {
-		uint64_t 	UUID;
+		std::string SerialNumber;
+		uint64_t 	UUID = 0 ;
 		std::string Data;
-		uint64_t 	Recorded;
+		uint64_t 	Recorded = 0;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct HealthCheck {
-		uint64_t 	UUID;
+		std::string SerialNumber;
+		uint64_t 	UUID = 0 ;
 		std::string Data;
-		uint64_t 	Recorded;
-		uint64_t 	Sanity;
+		uint64_t 	Recorded = 0 ;
+		uint64_t 	Sanity = 0 ;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct Capabilities {
 		std::string Capabilities;
-		uint64_t 	FirstUpdate;
-		uint64_t 	LastUpdate;
+		uint64_t 	FirstUpdate = 0 ;
+		uint64_t 	LastUpdate = 0 ;
 		void 		to_json(Poco::JSON::Object &Obj) const;
 	};
 
@@ -96,24 +106,25 @@ namespace OpenWifi::GWObjects {
 			LOG_INFO = 6,	 /* informational */
 			LOG_DEBUG = 7	 /* debug-level messages */
 		};
+		std::string SerialNumber;
 		std::string Log;
 		std::string Data;
-		uint64_t 	Severity;
-		uint64_t 	Recorded;
-		uint64_t 	LogType;
-		uint64_t 	UUID;
+		uint64_t 	Severity = 0 ;
+		uint64_t 	Recorded = 0 ;
+		uint64_t 	LogType = 0 ;
+		uint64_t 	UUID = 0 ;
 		void 		to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct DefaultConfiguration {
 		std::string Name;
 		std::string Configuration;
-		std::string Models;
+		Types::StringVec Models;
 		std::string Description;
 		uint64_t 	Created;
 		uint64_t 	LastModified;
 		void 		to_json(Poco::JSON::Object &Obj) const;
-		bool 		from_json(Poco::JSON::Object::Ptr Obj);
+		bool 		from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct CommandDetails {
@@ -135,34 +146,36 @@ namespace OpenWifi::GWObjects {
 		uint64_t AttachDate = 0 ;
 		uint64_t AttachSize = 0 ;
 		std::string AttachType;
+		double 		executionTime = 0.0;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct BlackListedDevice {
-		std::string SerialNumber;
-		std::string Reason;
-		std::string Author;
-		uint64_t Created;
+		std::string serialNumber;
+		std::string reason;
+		std::string author;
+		uint64_t created;
 		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct RttySessionDetails {
 		std::string SerialNumber;
 		std::string Server;
-		uint64_t 	Port;
+		uint64_t 	Port = 0 ;
 		std::string Token;
-		uint64_t 	TimeOut;
+		uint64_t 	TimeOut = 0 ;
 		std::string ConnectionId;
-		uint64_t 	Started;
+		uint64_t 	Started = 0 ;
 		std::string CommandUUID;
-		uint64_t 	ViewPort;
+		uint64_t 	ViewPort = 0 ;
 		std::string DevicePassword;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct Dashboard {
-		uint64_t 		  snapshot;
-		uint64_t 		  numberOfDevices;
+		uint64_t 		  snapshot = 0 ;
+		uint64_t 		  numberOfDevices = 0 ;
 		Types::CountedMap commands;
 		Types::CountedMap upTimes;
 		Types::CountedMap memoryUsed;
@@ -179,6 +192,60 @@ namespace OpenWifi::GWObjects {
 		void to_json(Poco::JSON::Object &Obj) const;
 		void reset();
 	};
-}
 
-#endif //UCENTRAL_RESTAPI_OBJECTS_H
+	struct CapabilitiesModel {
+		std::string deviceType;
+		std::string capabilities;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+	};
+
+	struct ScriptRequest {
+		uint64_t 	timeout=30;
+		std::string serialNumber;
+		std::string type;
+		std::string script;
+		std::string scriptId;
+		uint64_t 	when=0;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct RadiusProxyServerEntry {
+		std::string name;
+		std::string ip;
+		uint16_t 	port=0;
+		uint64_t 	weight=0;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct RadiusProxyServerConfig {
+		std::string 	strategy;
+		bool 			monitor=false;
+		std::string 	monitorMethod;
+		std::vector<std::string>	methodParameters;
+		std::vector<RadiusProxyServerEntry>	servers;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct 	RadiusProxyPool {
+		std::string name;
+		std::string description;
+		RadiusProxyServerConfig	authConfig;
+		RadiusProxyServerConfig	acctConfig;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct RadiusProxyPoolList {
+		std::vector<RadiusProxyPool>	pools;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+}

src/RESTObjects/RESTAPI_ProvObjects.h

@@ -0,0 +1,685 @@
+//
+//	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.
+//
+
+#pragma once
+
+#include <string>
+#include "RESTAPI_SecurityObjects.h"
+
+namespace OpenWifi::ProvObjects {
+
+    enum FIRMWARE_UPGRADE_RULES {
+        dont_upgrade,
+        upgrade_inherit,
+        upgrade_release_only,
+        upgrade_latest
+    };
+
+    struct ObjectInfo {
+        Types::UUID_t   id;
+        std::string     name;
+        std::string     description;
+        SecurityObjects::NoteInfoVec notes;
+        uint64_t        created=0;
+        uint64_t        modified=0;
+        Types::TagList  tags;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct SerialNumberList {
+        Types::UUIDvec_t    serialNumbers;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ManagementPolicyEntry {
+        Types::UUIDvec_t users;
+        Types::UUIDvec_t resources;
+        Types::StringVec access;
+        std::string policy;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ManagementPolicy {
+        ObjectInfo          info;
+        std::vector<ManagementPolicyEntry>  entries;
+        Types::StringVec    inUse;
+        Types::UUID_t       entity;
+        Types::UUID_t       venue;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<ManagementPolicy>      ManagementPolicyVec;
+
+    struct DeviceRules {
+        std::string     rcOnly{"inherit"};
+        std::string     rrm{"inherit"};
+        std::string     firmwareUpgrade{"inherit"};
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct Entity {
+        ObjectInfo              info;
+        Types::UUID_t           parent;
+        Types::UUIDvec_t        children;
+        Types::UUIDvec_t        venues;
+        Types::UUIDvec_t        contacts;       // all contacts associated in this entity
+        Types::UUIDvec_t        locations;      // all locations associated in this entity
+        Types::UUID_t           managementPolicy;
+        Types::UUIDvec_t        deviceConfiguration;
+        Types::UUIDvec_t        devices;
+        DeviceRules             deviceRules;
+        Types::StringVec        sourceIP;
+        Types::UUIDvec_t        variables;
+        Types::UUIDvec_t        managementPolicies;
+        Types::UUIDvec_t        managementRoles;
+        Types::UUIDvec_t        maps;
+        Types::UUIDvec_t        configurations;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<Entity>      EntityVec;
+
+    struct DiGraphEntry {
+        Types::UUID_t parent;
+        Types::UUID_t child;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    typedef std::vector<DiGraphEntry>   DiGraph;
+
+    struct Venue {
+        ObjectInfo          info;
+        Types::UUID_t       entity;
+        Types::UUID_t       parent;
+        Types::UUIDvec_t    children;
+        Types::UUID_t       managementPolicy;
+        Types::UUIDvec_t    devices;
+        DiGraph             topology;
+        std::string         design;
+        Types::UUIDvec_t    deviceConfiguration;
+        Types::UUIDvec_t    contacts;
+        std::string         location;
+        DeviceRules         deviceRules;
+        Types::StringVec    sourceIP;
+        Types::UUIDvec_t    variables;
+        Types::UUIDvec_t    configurations;
+        Types::UUIDvec_t    maps;
+        Types::UUIDvec_t    managementPolicies;
+        Types::UUIDvec_t    managementRoles;
+        Types::UUIDvec_t    boards;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<Venue>      VenueVec;
+
+    struct UserInfoDigest {
+        std::string     id;
+        std::string     loginId;
+        std::string     userType;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ManagementRole {
+        ObjectInfo          info;
+        Types::UUID_t       managementPolicy;
+        Types::UUIDvec_t    users;
+        Types::StringVec    inUse;
+        Types::UUID_t       entity;
+        Types::UUID_t       venue;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<ManagementRole>      ManagementRoleVec;
+
+    enum LocationType {
+        LT_SERVICE, LT_EQUIPMENT, LT_AUTO, LT_MANUAL,
+        LT_SPECIAL, LT_UNKNOWN, LT_CORPORATE
+    };
+
+    inline std::string to_string(LocationType L) {
+        switch(L) {
+            case LT_SERVICE: return "SERVICE";
+            case LT_EQUIPMENT: return "EQUIPMENT";
+            case LT_AUTO: return "AUTO";
+            case LT_MANUAL: return "MANUAL";
+            case LT_SPECIAL: return "SPECIAL";
+            case LT_UNKNOWN: return "UNKNOWN";
+            case LT_CORPORATE: return "CORPORATE";
+            default: return "UNKNOWN";
+        }
+    }
+
+    inline LocationType location_from_string(const std::string &S) {
+        if(!Poco::icompare(S,"SERVICE"))
+            return LT_SERVICE;
+        else if(!Poco::icompare(S,"EQUIPMENT"))
+            return LT_EQUIPMENT;
+        else if(!Poco::icompare(S,"AUTO"))
+            return LT_AUTO;
+        else if(!Poco::icompare(S,"MANUAL"))
+            return LT_MANUAL;
+        else if(!Poco::icompare(S,"SPECIAL"))
+            return LT_SPECIAL;
+        else if(!Poco::icompare(S,"UNKNOWN"))
+            return LT_UNKNOWN;
+        else if(!Poco::icompare(S,"CORPORATE"))
+            return LT_CORPORATE;
+        return LT_UNKNOWN;
+    }
+
+    struct Location {
+        ObjectInfo          info;
+        LocationType        type;
+        std::string         buildingName;
+        Types::StringVec    addressLines;
+        std::string         city;
+        std::string         state;
+        std::string         postal;
+        std::string         country;
+        Types::StringVec    phones;
+        Types::StringVec    mobiles;
+        std::string         geoCode;
+        Types::StringVec    inUse;
+        Types::UUID_t       entity;
+        Types::UUID_t       managementPolicy;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<Location>      LocationVec;
+
+    struct OperatorLocation {
+        ObjectInfo          info;
+        std::string         type;
+        std::string         buildingName;
+        Types::StringVec    addressLines;
+        std::string         city;
+        std::string         state;
+        std::string         postal;
+        std::string         country;
+        Types::StringVec    phones;
+        Types::StringVec    mobiles;
+        std::string         geoCode;
+        Types::UUID_t       operatorId;
+        Types::UUID_t       subscriberDeviceId;
+        Types::UUID_t       managementPolicy;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<Location>      LocationVec;
+
+    struct SubLocation {
+        std::string         type;
+        std::string         buildingName;
+        Types::StringVec    addressLines;
+        std::string         city;
+        std::string         state;
+        std::string         postal;
+        std::string         country;
+        Types::StringVec    phones;
+        Types::StringVec    mobiles;
+        std::string         geoCode;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct OperatorLocationList {
+        std::vector<OperatorLocation>    locations;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+
+    enum ContactType {
+        CT_SUBSCRIBER, CT_USER, CT_INSTALLER, CT_CSR, CT_MANAGER,
+        CT_BUSINESSOWNER, CT_TECHNICIAN, CT_CORPORATE, CT_UNKNOWN
+    };
+
+    inline std::string to_string(ContactType L) {
+        switch(L) {
+            case CT_SUBSCRIBER: return "SUBSCRIBER";
+            case CT_USER: return "USER";
+            case CT_INSTALLER: return "INSTALLER";
+            case CT_CSR: return "CSR";
+            case CT_MANAGER: return "MANAGER";
+            case CT_BUSINESSOWNER: return "BUSINESSOWNER";
+            case CT_TECHNICIAN: return "TECHNICIAN";
+            case CT_CORPORATE: return "CORPORATE";
+            case CT_UNKNOWN: return "UNKNOWN";
+            default: return "UNKNOWN";
+        }
+    }
+
+    inline ContactType contact_from_string(const std::string &S) {
+        if(!Poco::icompare(S,"SUBSCRIBER"))
+            return CT_SUBSCRIBER;
+        else if(!Poco::icompare(S,"USER"))
+            return CT_USER;
+        else if(!Poco::icompare(S,"INSTALLER"))
+            return CT_INSTALLER;
+        else if(!Poco::icompare(S,"CSR"))
+            return CT_CSR;
+        else if(!Poco::icompare(S,"BUSINESSOWNER"))
+            return CT_BUSINESSOWNER;
+        else if(!Poco::icompare(S,"TECHNICIAN"))
+            return CT_TECHNICIAN;
+        else if(!Poco::icompare(S,"CORPORATE"))
+            return CT_CORPORATE;
+        else if(!Poco::icompare(S,"UNKNOWN"))
+            return CT_UNKNOWN;
+        return CT_UNKNOWN;
+    }
+
+    struct Contact {
+        ObjectInfo  info;
+        ContactType type=CT_USER;
+        std::string title;
+        std::string salutation;
+        std::string firstname;
+        std::string lastname;
+        std::string initials;
+        std::string visual;
+        Types::StringVec mobiles;
+        Types::StringVec phones;
+        std::string primaryEmail;
+        std::string secondaryEmail;
+        std::string accessPIN;
+        Types::StringVec inUse;
+        Types::UUID_t   entity;
+        Types::UUID_t   managementPolicy;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<Contact>      ContactVec;
+
+    struct OperatorContact {
+        ObjectInfo      info;
+        std::string     type;
+        std::string     title;
+        std::string     salutation;
+        std::string     firstname;
+        std::string     lastname;
+        std::string     initials;
+        std::string     visual;
+        Types::StringVec mobiles;
+        Types::StringVec phones;
+        std::string     primaryEmail;
+        std::string     secondaryEmail;
+        std::string     accessPIN;
+        Types::UUID_t   operatorId;
+        Types::UUID_t   subscriberDeviceId;
+        Types::UUID_t   managementPolicy;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct SubContact {
+        std::string     type;
+        std::string     title;
+        std::string     salutation;
+        std::string     firstname;
+        std::string     lastname;
+        std::string     initials;
+        std::string     visual;
+        Types::StringVec mobiles;
+        Types::StringVec phones;
+        std::string     primaryEmail;
+        std::string     secondaryEmail;
+        std::string     accessPIN;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct OperatorContactList {
+        std::vector<OperatorContact>    contacts;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    typedef std::vector<OperatorContact>      OperatorContactVec;
+
+    struct DeviceConfigurationElement {
+        std::string name;
+        std::string description;
+        uint64_t    weight;
+        std::string configuration;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<DeviceConfigurationElement> DeviceConfigurationElementVec;
+
+    struct DeviceConfiguration {
+        ObjectInfo                      info;
+        Types::UUID_t                   managementPolicy;
+        Types::StringVec                deviceTypes;
+        DeviceConfigurationElementVec   configuration;
+        Types::StringVec                inUse;
+        Types::UUIDvec_t                variables;
+        DeviceRules                     deviceRules;
+        bool                            subscriberOnly=false;
+        std::string                     venue;
+        std::string                     entity;
+        std::string                     subscriber;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<DeviceConfiguration>      DeviceConfigurationVec;
+
+
+    struct InventoryTag {
+        ObjectInfo      info;
+        std::string     serialNumber;
+        std::string     venue;
+        std::string     entity;
+        std::string     subscriber;
+        std::string     deviceType;
+        std::string     qrCode;
+        std::string     geoCode;
+        std::string     location;
+        std::string     contact;
+        std::string     deviceConfiguration;
+        DeviceRules     deviceRules;
+        Types::UUID_t   managementPolicy;
+        std::string     state;
+        std::string     devClass;
+        std::string     locale;
+        std::string     realMacAddress;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    typedef std::vector<InventoryTag>      InventoryTagVec;
+
+    struct InventoryTagList {
+        InventoryTagVec     taglist;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct InventoryConfigApplyResult {
+        std::string         appliedConfiguration;
+        Types::StringVec    errors;
+        Types::StringVec    warnings;
+        uint64_t            errorCode;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct Report {
+        uint64_t            snapShot=0;
+        Types::CountedMap   tenants;
+
+        void        reset();
+        void to_json(Poco::JSON::Object &Obj) const;
+    };
+
+    struct ExpandedUseEntry {
+        std::string uuid;
+        std::string name;
+        std::string description;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ExpandedUseEntryList {
+        std::string                     type;
+        std::vector<ExpandedUseEntry>   entries;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ExpandedUseEntryMapList {
+        std::vector<ExpandedUseEntryList>    entries;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct UuidList {
+        Types::UUIDvec_t    list;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    enum ACLACCESS {
+        NONE = 0, READ=1, MODIFY=2, CREATE=3, DELETE=4
+    };
+
+    struct ObjectACL {
+        UuidList        users;
+        UuidList        roles;
+        uint64_t        access = (uint64_t) NONE;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ObjectACLList {
+        std::vector<ObjectACL>  list;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct Map {
+        ObjectInfo          info;
+        std::string         data;
+        std::string         entity;
+        std::string         creator;
+        std::string         visibility{"private"};
+        ObjectACLList       access;
+        Types::UUID_t       managementPolicy;
+        std::string         venue;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct MapList {
+        std::vector<Map>    list;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    enum SignupStatusCodes {
+        SignupCreated = 0 ,
+        SignupWaitingForEmail,
+        SignupWaitingForDevice,
+        SignupSuccess,
+        SignupFailure,
+        SignupCanceled,
+        SignupTimedOut
+    };
+
+    struct SignupEntry {
+        ObjectInfo          info;
+        std::string         email;
+        std::string         userId;
+        std::string         macAddress;
+        std::string         serialNumber;
+        uint64_t            submitted = 0 ;
+        uint64_t            completed = 0 ;
+        std::string         status;
+        uint64_t            error=0;
+        uint64_t            statusCode=0;
+        std::string         deviceID;
+        std::string         registrationId;
+        std::string         operatorId;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct Variable {
+        std::string         type;
+        uint64_t            weight=0;
+        std::string         prefix;
+        std::string         value;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct VariableList {
+        std::vector<Variable>   variables;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct VariableBlock {
+        ObjectInfo                  info;
+        std::vector<Variable>       variables;
+        std::string                 entity;
+        std::string                 venue;
+        std::string                 subscriber;
+        std::string                 inventory;
+        Types::UUIDvec_t            configurations;
+        Types::UUID_t               managementPolicy;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct VariableBlockList {
+        std::vector<VariableBlock>      variableBlocks;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct Operator {
+        ObjectInfo                      info;
+        Types::UUID_t                   managementPolicy;
+        Types::UUIDvec_t                managementRoles;
+        DeviceRules                     deviceRules;
+        std::vector<Variable>           variables;
+        bool                            defaultOperator=false;
+        Types::StringVec                sourceIP;
+        std::string                     registrationId;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct OperatorList {
+        std::vector<Operator>            operators;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct VenueDeviceList {
+        std::string         id;
+        std::string         name;
+        std::string         description;
+        Types::UUIDvec_t    devices;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ServiceClass {
+        ObjectInfo                      info;
+        Types::UUID_t                   operatorId;
+        Types::UUID_t                   managementPolicy;
+        double                          cost=0.0;
+        std::string                     currency;
+        std::string                     period;
+        std::string                     billingCode;
+        std::vector<Variable>           variables;
+        bool                            defaultService=false;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ServiceClassList {
+        std::vector<ServiceClass>            serviceClasses;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ConfigurationDetails {
+        DeviceConfigurationElementVec   configuration;
+        std::string                     rrm{"inherit"};
+        std::string                     firmwareUpgrade{"inherit"};
+        std::string                     firmwareRCOnly{"inherit"};
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct SubscriberDevice {
+        ObjectInfo                      info;
+        std::string                     serialNumber;
+        std::string                     deviceType;
+        Types::UUID_t                   operatorId;
+        Types::UUID_t                   subscriberId;
+        SubLocation                     location;
+        SubContact                      contact;
+        Types::UUID_t                   managementPolicy;
+        Types::UUID_t                   serviceClass;
+        std::string                     qrCode;
+        std::string                     geoCode;
+        DeviceRules                     deviceRules;
+        std::string                     state;
+        std::string                     locale;
+        std::string                     billingCode;
+        DeviceConfigurationElementVec   configuration;
+        bool                            suspended=false;
+        std::string                     realMacAddress;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct SubscriberDeviceList {
+        std::vector<SubscriberDevice>       subscriberDevices;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    bool UpdateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I);
+    bool CreateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I);
+    bool CreateObjectInfo(const SecurityObjects::UserInfo &U, ObjectInfo &I);
+};

src/RESTObjects/RESTAPI_SecurityObjects.cpp

@@ -9,8 +9,8 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"
 
+#include "framework/MicroService.h"
 #include "RESTAPI_SecurityObjects.h"
-#include "RESTAPI_utils.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -54,25 +54,35 @@ namespace OpenWifi::SecurityObjects {
             return ADMIN;
         else if (!Poco::icompare(U,"subscriber"))
             return SUBSCRIBER;
+        else if (!Poco::icompare(U,"partner"))
+            return PARTNER;
         else if (!Poco::icompare(U,"csr"))
             return CSR;
         else if (!Poco::icompare(U, "system"))
             return SYSTEM;
-        else if (!Poco::icompare(U, "special"))
-            return SPECIAL;
+        else if (!Poco::icompare(U, "installer"))
+            return INSTALLER;
+        else if (!Poco::icompare(U, "noc"))
+            return NOC;
+        else if (!Poco::icompare(U, "accounting"))
+            return ACCOUNTING;
         return UNKNOWN;
     }
 
     std::string UserTypeToString(USER_ROLE U) {
         switch(U) {
-            case UNKNOWN: return "unknown";
             case ROOT: return "root";
+            case ADMIN: return "admin";
             case SUBSCRIBER: return "subscriber";
+            case PARTNER: return "partner";
             case CSR: return "csr";
             case SYSTEM: return "system";
-            case SPECIAL: return "special";
-            case ADMIN: return "admin";
-            default: return "unknown";
+            case INSTALLER: return "installer";
+            case NOC: return "noc";
+            case ACCOUNTING: return "accounting";
+            case UNKNOWN:
+            default:
+                return "unknown";
         }
     }
 
@@ -85,6 +95,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "PortalLogin", PortalLogin_);
 			return true;
 		} catch(...) {
+            std::cout << "Cannot parse: AclTemplate" << std::endl;
 		}
 		return false;
 	}
@@ -102,6 +113,8 @@ namespace OpenWifi::SecurityObjects {
         field_to_json(Obj,"userMustChangePassword",userMustChangePassword);
         field_to_json(Obj,"errorCode", errorCode);
 		Obj.set("aclTemplate",AclTemplateObj);
+        field_to_json(Obj,"errorCode", errorCode);
+        field_to_json(Obj,"lastRefresh", lastRefresh_);
 	}
 
 	bool WebToken::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -118,15 +131,105 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "created", created_);
 			field_from_json(Obj, "username", username_);
             field_from_json(Obj, "userMustChangePassword",userMustChangePassword);
+            field_from_json(Obj,"lastRefresh", lastRefresh_);
 			return true;
 		} catch (...) {
-
+            std::cout << "Cannot parse: WebToken" << std::endl;
 		}
 		return false;
 	}
 
+	void MobilePhoneNumber::to_json(Poco::JSON::Object &Obj) const {
+	    field_to_json(Obj,"number", number);
+	    field_to_json(Obj,"verified", verified);
+	    field_to_json(Obj,"primary", primary);
+	}
+
+	bool MobilePhoneNumber::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	    try {
+	        field_from_json(Obj,"number",number);
+	        field_from_json(Obj,"verified",verified);
+	        field_from_json(Obj,"primary",primary);
+	        return true;
+	    } catch (...) {
+            std::cout << "Cannot parse: MobilePhoneNumber" << std::endl;
+	    }
+	    return false;
+	};
+
+	void MfaAuthInfo::to_json(Poco::JSON::Object &Obj) const {
+	    field_to_json(Obj,"enabled", enabled);
+	    field_to_json(Obj,"method", method);
+	}
+
+	bool MfaAuthInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	    try {
+	        field_from_json(Obj,"enabled",enabled);
+	        field_from_json(Obj,"method",method);
+	        return true;
+	    } catch (...) {
+            std::cout << "Cannot parse: MfaAuthInfo" << std::endl;
+	    }
+	    return false;
+	}
+
+	void UserLoginLoginExtensions::to_json(Poco::JSON::Object &Obj) const {
+	    field_to_json(Obj, "mobiles", mobiles);
+	    field_to_json(Obj, "mfa", mfa);
+        field_to_json(Obj, "authenticatorSecret", authenticatorSecret);
+	}
+
+	bool UserLoginLoginExtensions::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	    try {
+	        field_from_json(Obj, "mobiles",mobiles);
+	        field_from_json(Obj, "mfa",mfa);
+            field_from_json(Obj, "authenticatorSecret", authenticatorSecret);
+	        return true;
+	    } catch (...) {
+            std::cout << "Cannot parse: UserLoginLoginExtensions" << std::endl;
+	    }
+	    return false;
+	}
+
+    void MFAChallengeRequest::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "uuid", uuid);
+        field_to_json(Obj, "question", question);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "method", method);
+    }
+
+    bool MFAChallengeRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	    try {
+	        field_from_json(Obj,"uuid",uuid);
+	        field_from_json(Obj,"question",question);
+	        field_from_json(Obj,"created",created);
+	        field_from_json(Obj,"method",method);
+	        return true;
+	    } catch (...) {
+            std::cout << "Cannot parse: MFAChallengeRequest" << std::endl;
+	    }
+	    return false;
+	};
+
+    void MFAChallengeResponse::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "uuid", uuid);
+        field_to_json(Obj, "answer", answer);
+    }
+
+    bool MFAChallengeResponse::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"uuid",uuid);
+            field_from_json(Obj,"answer",answer);
+            return true;
+        } catch (...) {
+            std::cout << "Cannot parse: MFAChallengeResponse" << std::endl;
+        }
+        return false;
+
+    }
+
     void UserInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"Id",Id);
+		field_to_json(Obj,"id",id);
 		field_to_json(Obj,"name",name);
 		field_to_json(Obj,"description", description);
 		field_to_json(Obj,"avatar", avatar);
@@ -156,11 +259,13 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"lastPasswords",lastPasswords);
 		field_to_json(Obj,"oauthType",oauthType);
 		field_to_json(Obj,"oauthUserInfo",oauthUserInfo);
+        field_to_json(Obj,"modified",modified);
+        field_to_json(Obj,"signingUp",signingUp);
     };
 
     bool UserInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
         try {
-			field_from_json(Obj,"Id",Id);
+			field_from_json(Obj,"id",id);
 			field_from_json(Obj,"name",name);
 			field_from_json(Obj,"description",description);
 			field_from_json(Obj,"avatar",avatar);
@@ -170,6 +275,8 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"currentLoginURI",currentLoginURI);
 			field_from_json(Obj,"locale",locale);
 			field_from_json(Obj,"notes",notes);
+            field_from_json(Obj,"location", location);
+            field_from_json(Obj,"owner", owner);
 			field_from_json<USER_ROLE>(Obj,"userRole",userRole, UserTypeFromString);
 			field_from_json(Obj,"securityPolicy",securityPolicy);
 			field_from_json(Obj,"userTypeProprietaryInfo",userTypeProprietaryInfo);
@@ -188,13 +295,29 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"lastPasswords",lastPasswords);
 			field_from_json(Obj,"oauthType",oauthType);
 			field_from_json(Obj,"oauthUserInfo",oauthUserInfo);
+            field_from_json(Obj,"modified",modified);
+            field_from_json(Obj,"signingUp",signingUp);
             return true;
         } catch (const Poco::Exception &E) {
-
+            std::cout << "Cannot parse: UserInfo" << std::endl;
         }
         return false;
     };
 
+    void UserInfoList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"users",users);
+    }
+
+    bool UserInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"users",users);
+            return true;
+        } catch (...) {
+            std::cout << "Cannot parse: InternalServiceInfo" << std::endl;
+        }
+        return false;
+    }
+
 	void InternalServiceInfo::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"privateURI",privateURI);
 		field_to_json(Obj,"publicURI",publicURI);
@@ -208,7 +331,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"token",token);
 			return true;
 		} catch (...) {
-
+            std::cout << "Cannot parse: InternalServiceInfo" << std::endl;
 		}
 		return false;
 	};
@@ -226,7 +349,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "services", services);
 			return true;
 		} catch(...) {
-
+            std::cout << "Cannot parse: InternalSystemServices" << std::endl;
 		}
 		return false;
 	};
@@ -248,7 +371,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "authenticationType", authenticationType);
 			return true;
 		} catch (...) {
-
+            std::cout << "Cannot parse: SystemEndpoint" << std::endl;
 		}
 		return false;
 	};
@@ -262,7 +385,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "endpoints", endpoints);
 			return true;
 		} catch (...) {
-
+            std::cout << "Cannot parse: SystemEndpointList" << std::endl;
 		}
 		return false;
 	}
@@ -281,7 +404,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "userInfo", userinfo);
 			return true;
 		} catch(...) {
-
+            std::cout << "Cannot parse: UserInfoAndPolicy" << std::endl;
 		}
 		return false;
 	}
@@ -292,42 +415,55 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"note", note);
 	}
 
-	bool NoteInfo::from_json(Poco::JSON::Object::Ptr Obj) {
+	bool NoteInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj,"created",created);
+            field_from_json(Obj,"created",created);
 			field_from_json(Obj,"createdBy",createdBy);
-			field_from_json(Obj,"note",note);
+			field_from_json(Obj,"note", note);
+			return true;
 		} catch(...) {
-
+            std::cout << "Cannot parse: NoteInfo" << std::endl;
 		}
 		return false;
 	}
 
-    bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes) {
+    bool MergeNotes(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);
+	        if(Obj->has("notes") && Obj->isArray("notes")) {
+	            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)OpenWifi::Now(), .createdBy=UInfo.email, .note=i.note};
+	                Notes.push_back(ii);
+	            }
 	        }
+	        return true;
 	    } catch(...) {
-
+            std::cout << "Cannot parse: MergeNotes" << std::endl;
 	    }
 	    return false;
 	}
 
+	bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes) {
+	    for(auto const &i:NewNotes) {
+	        SecurityObjects::NoteInfo   ii{.created=(uint64_t)OpenWifi::Now(), .createdBy=UInfo.email, .note=i.note};
+	        ExistingNotes.push_back(ii);
+	    }
+        return true;
+	}
+
 	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) {
+	bool ProfileAction::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"resource",resource);
 			field_from_json<ResourceAccessType>(Obj,"access",access,ResourceAccessTypeFromString );
+			return true;
 		} catch(...) {
-
+            std::cout << "Cannot parse: ProfileAction" << std::endl;
 		}
 		return false;
 	}
@@ -341,7 +477,7 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"notes", notes);
 	}
 
-	bool SecurityProfile::from_json(Poco::JSON::Object::Ptr Obj) {
+	bool SecurityProfile::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"id",id);
 			field_from_json(Obj,"name",name);
@@ -349,8 +485,9 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"policy",policy);
 			field_from_json(Obj,"role",role);
 			field_from_json(Obj,"notes",notes);
+			return true;
 		} catch(...) {
-
+            std::cout << "Cannot parse: SecurityProfile" << std::endl;
 		}
 		return false;
 	}
@@ -359,13 +496,128 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj, "profiles", profiles);
 	}
 
-	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr Obj) {
+	bool SecurityProfileList::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"profiles",profiles);
+			return true;
 		} catch(...) {
-
+            std::cout << "Cannot parse: SecurityProfileList" << std::endl;
 		}
 		return false;
 	}
+
+    void ActionLink::to_json(Poco::JSON::Object &Obj) const {
+	    field_to_json(Obj,"id",id);
+	    field_to_json(Obj,"action",action);
+	    field_to_json(Obj,"userId",userId);
+	    field_to_json(Obj,"actionTemplate",actionTemplate);
+	    field_to_json(Obj,"variables",variables);
+	    field_to_json(Obj,"locale",locale);
+	    field_to_json(Obj,"message",message);
+	    field_to_json(Obj,"sent",sent);
+	    field_to_json(Obj,"created",created);
+	    field_to_json(Obj,"expires",expires);
+	    field_to_json(Obj,"completed",completed);
+	    field_to_json(Obj,"canceled",canceled);
+        field_to_json(Obj,"userAction",userAction);
+	}
+
+    bool ActionLink::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	    try {
+	        field_from_json(Obj,"id",id);
+	        field_from_json(Obj,"action",action);
+	        field_from_json(Obj,"userId",userId);
+	        field_from_json(Obj,"actionTemplate",actionTemplate);
+	        field_from_json(Obj,"variables",variables);
+	        field_from_json(Obj,"locale",locale);
+	        field_from_json(Obj,"message",message);
+	        field_from_json(Obj,"sent",sent);
+	        field_from_json(Obj,"created",created);
+	        field_from_json(Obj,"expires",expires);
+	        field_from_json(Obj,"completed",completed);
+	        field_from_json(Obj,"canceled",canceled);
+            field_from_json(Obj,"userAction",userAction);
+	        return true;
+	    } catch(...) {
+            std::cout << "Cannot parse: ActionLink" << std::endl;
+	    }
+	    return false;
+	}
+
+    void Preferences::to_json(Poco::JSON::Object &Obj) const {
+	    field_to_json(Obj,"id",id);
+	    field_to_json(Obj,"modified",modified);
+	    field_to_json(Obj,"data",data);
+	}
+
+    bool Preferences::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	    try {
+	        field_from_json(Obj,"id",id);
+	        field_from_json(Obj,"modified",modified);
+	        field_from_json(Obj,"data",data);
+	        return true;
+	    } catch(...) {
+            std::cout << "Cannot parse: Preferences" << std::endl;
+	    }
+	    return false;
+	}
+
+    void SubMfaConfig::to_json(Poco::JSON::Object &Obj) const {
+	    field_to_json(Obj,"id",id);
+	    field_to_json(Obj,"type",type);
+	    field_to_json(Obj,"sms",sms);
+	    field_to_json(Obj,"email",email);
+	}
+
+    bool SubMfaConfig::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	    try {
+	        field_from_json(Obj,"id",id);
+	        field_from_json(Obj,"type",type);
+	        field_from_json(Obj,"sms",sms);
+	        field_from_json(Obj,"email",email);
+	        return true;
+	    } catch(...) {
+            std::cout << "Cannot parse: SubMfaConfig" << std::endl;
+	    }
+	    return false;
+	}
+
+    void Token::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"token",token);
+        field_to_json(Obj,"refreshToken",refreshToken);
+        field_to_json(Obj,"tokenType",tokenType);
+        field_to_json(Obj,"userName",userName);
+        field_to_json(Obj,"created",created);
+        field_to_json(Obj,"expires",expires);
+        field_to_json(Obj,"idleTimeout",idleTimeout);
+        field_to_json(Obj,"revocationDate",revocationDate);
+        field_to_json(Obj,"lastRefresh", lastRefresh);
+    }
+
+    bool Token::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"token",token);
+            field_from_json(Obj,"refreshToken",refreshToken);
+            field_from_json(Obj,"tokenType",tokenType);
+            field_from_json(Obj,"userName",userName);
+            field_from_json(Obj,"created",created);
+            field_from_json(Obj,"expires",expires);
+            field_from_json(Obj,"idleTimeout",idleTimeout);
+            field_from_json(Obj,"revocationDate",revocationDate);
+            field_from_json(Obj,"lastRefresh", lastRefresh);
+            return true;
+        } catch(...) {
+            std::cout << "Cannot parse: Token" << std::endl;
+        }
+        return false;
+    }
+
+    void LoginRecordInfo::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"sessionId",sessionId);
+        field_to_json(Obj,"userId",userId);
+        field_to_json(Obj,"email",email);
+        field_to_json(Obj,"login",login);
+        field_to_json(Obj,"logout",logout);
+    }
 }
 

src/RESTObjects/RESTAPI_SecurityObjects.h

@@ -0,0 +1,327 @@
+//
+//	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.
+//
+
+#pragma once
+
+#include <string>
+#include <type_traits>
+#include "framework/OpenWifiTypes.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/Data/LOB.h"
+#include "Poco/Data/LOBStream.h"
+
+namespace OpenWifi {
+    uint64_t Now();
+    namespace SecurityObjects {
+        
+        typedef std::string USER_ID_TYPE;
+
+        struct AclTemplate {
+            bool Read_ = true;
+            bool ReadWrite_ = true;
+            bool ReadWriteCreate_ = true;
+            bool Delete_ = true;
+            bool PortalLogin_ = true;
+
+            AclTemplate()  noexcept = default;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        static_assert( std::is_nothrow_move_constructible_v<AclTemplate> );
+
+        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;
+            uint64_t lastRefresh_=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, INSTALLER, NOC, ACCOUNTING, PARTNER
+        };
+
+        USER_ROLE UserTypeFromString(const std::string &U);
+        std::string UserTypeToString(USER_ROLE U);
+
+        struct NoteInfo {
+            uint64_t    created=0; // = OpenWifi::Now();
+            std::string createdBy;
+            std::string note;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::vector<NoteInfo>	NoteInfoVec;
+
+        struct MobilePhoneNumber {
+            std::string number;
+            bool verified = false;
+            bool primary = false;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct MfaAuthInfo {
+            bool enabled = false;
+            std::string method;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct UserLoginLoginExtensions {
+            std::vector<MobilePhoneNumber>  mobiles;
+            struct MfaAuthInfo              mfa;
+            std::string                     authenticatorSecret;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct MFAChallengeRequest {
+            std::string uuid;
+            std::string question;
+            std::string method;
+            uint64_t    created = OpenWifi::Now();
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct MFAChallengeResponse {
+            std::string uuid;
+            std::string answer;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        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;
+            UserLoginLoginExtensions userTypeProprietaryInfo;
+            std::string securityPolicy;
+            uint64_t    securityPolicyChange = 0 ;
+            std::string currentPassword;
+            OpenWifi::Types::StringVec lastPasswords;
+            std::string oauthType;
+            std::string oauthUserInfo;
+            uint64_t    modified;
+            std::string signingUp;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::vector<UserInfo>   UserInfoVec;
+
+        struct UserInfoList {
+            std::vector<UserInfo>   users;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        // bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
+        bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
+        bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes);
+
+        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(const 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(const 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(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        enum LinkActions {
+            FORGOT_PASSWORD=1,
+            VERIFY_EMAIL,
+            SUB_FORGOT_PASSWORD,
+            SUB_VERIFY_EMAIL,
+            SUB_SIGNUP
+        };
+
+        struct ActionLink {
+            std::string         id;
+            uint64_t            action;
+            std::string         userId;
+            std::string         actionTemplate;
+            Types::StringPairVec variables;
+            std::string         locale;
+            std::string         message;
+            uint64_t            sent=0;
+            uint64_t            created=OpenWifi::Now();
+            uint64_t            expires=0;
+            uint64_t            completed=0;
+            uint64_t            canceled=0;
+            bool                userAction=true;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct Preferences {
+            std::string                         id;
+            uint64_t                            modified;
+            Types::StringPairVec                data;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct SubMfaConfig {
+            std::string                         id;
+            std::string                         type;
+            std::string                         sms;
+            std::string                         email;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct Token {
+            std::string         token;
+            std::string         refreshToken;
+            std::string         tokenType;
+            std::string         userName;
+            uint64_t            created=0;
+            uint64_t            expires=0;
+            uint64_t            idleTimeout=0;
+            uint64_t            revocationDate=0;
+            uint64_t            lastRefresh=0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct Avatar {
+            std::string             id;
+            std::string             type;
+            uint64_t                created=0;
+            std::string             name;
+            Poco::Data::BLOB        avatar;
+        };
+
+        struct LoginRecordInfo {
+            std::string sessionId;
+            std::string userId;
+            std::string email;
+            uint64_t    login=0;
+            uint64_t    logout=0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+        };
+    }
+}

src/RESTObjects/RESTAPI_SubObjects.cpp

@@ -0,0 +1,603 @@
+//
+// Created by stephane bourque on 2021-10-27.
+//
+
+#include "RESTAPI_SubObjects.h"
+#include "framework/MicroService.h"
+
+using OpenWifi::RESTAPI_utils::field_to_json;
+using OpenWifi::RESTAPI_utils::field_from_json;
+
+
+namespace OpenWifi::SubObjects {
+
+    void HomeDeviceMode::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "enableLEDS", enableLEDS);
+        field_to_json(Obj, "type", type);
+        field_to_json(Obj, "subnet", subnet);
+        field_to_json(Obj, "subnetMask", subnetMask);
+        field_to_json(Obj, "startIP", startIP);
+        field_to_json(Obj, "endIP", endIP);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+        field_to_json(Obj, "subnetV6", subnetV6);
+        field_to_json(Obj, "subnetMaskV6", subnetMaskV6);
+        field_to_json(Obj, "startIPV6", startIPV6);
+        field_to_json(Obj, "endIPV6", endIPV6);
+    }
+
+    bool HomeDeviceMode::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "enableLEDS", enableLEDS);
+            field_from_json(Obj, "type", type);
+            field_from_json(Obj, "subnet", subnet);
+            field_from_json(Obj, "subnetMask", subnetMask);
+            field_from_json(Obj, "startIP", startIP);
+            field_from_json(Obj, "endIP", endIP);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            field_from_json(Obj, "subnetV6", subnetV6);
+            field_from_json(Obj, "subnetMaskV6", subnetMaskV6);
+            field_from_json(Obj, "startIPV6", startIPV6);
+            field_from_json(Obj, "endIPV6", endIPV6);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void IPReservation::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "nickname", nickname);
+        field_to_json(Obj, "ipAddress", ipAddress);
+        field_to_json(Obj, "macAddress", macAddress);
+    }
+
+    bool IPReservation::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "nickname", nickname);
+            field_from_json(Obj, "ipAddress", ipAddress);
+            field_from_json(Obj, "macAddress", macAddress);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void IPReservationList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "id", id);
+        field_to_json(Obj, "reservations", reservations);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+    }
+
+    bool IPReservationList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "id", id);
+            field_from_json(Obj, "reservations", reservations);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void DnsConfiguration::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "ISP", ISP);
+        field_to_json(Obj, "custom", custom);
+        field_to_json(Obj, "primary", primary);
+        field_to_json(Obj, "secondary", secondary);
+        field_to_json(Obj, "primaryV6", primaryV6);
+        field_to_json(Obj, "secondaryV6", secondaryV6);
+    }
+
+    bool DnsConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "ISP", ISP);
+            field_from_json(Obj, "custom", custom);
+            field_from_json(Obj, "primary", primary);
+            field_from_json(Obj, "secondary", secondary);
+            field_from_json(Obj, "primaryV6", primaryV6);
+            field_from_json(Obj, "secondaryV6", secondaryV6);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void InternetConnection::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "type", type);
+        field_to_json(Obj, "username", username);
+        field_to_json(Obj, "password", password);
+        field_to_json(Obj, "ipAddress", ipAddress);
+        field_to_json(Obj, "subnetMask", subnetMask);
+        field_to_json(Obj, "defaultGateway", defaultGateway);
+        field_to_json(Obj, "sendHostname", sendHostname);
+        field_to_json(Obj, "primaryDns", primaryDns);
+        field_to_json(Obj, "secondaryDns", secondaryDns);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+        field_to_json(Obj, "ipV6Support", ipV6Support);
+        field_to_json(Obj, "ipAddressV6", ipAddressV6);
+        field_to_json(Obj, "subnetMaskV6", subnetMaskV6);
+        field_to_json(Obj, "defaultGatewayV6", defaultGatewayV6);
+        field_to_json(Obj, "primaryDnsV6", primaryDnsV6);
+        field_to_json(Obj, "secondaryDnsV6", secondaryDnsV6);
+    }
+
+    bool InternetConnection::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "type", type);
+            field_from_json(Obj, "username", username);
+            field_from_json(Obj, "password", password);
+            field_from_json(Obj, "ipAddress", ipAddress);
+            field_from_json(Obj, "subnetMask", subnetMask);
+            field_from_json(Obj, "defaultGateway", defaultGateway);
+            field_from_json(Obj, "sendHostname", sendHostname);
+            field_from_json(Obj, "primaryDns", primaryDns);
+            field_from_json(Obj, "secondaryDns", secondaryDns);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            field_from_json(Obj, "ipV6Support", ipV6Support);
+            field_from_json(Obj, "ipAddressV6", ipAddressV6);
+            field_from_json(Obj, "subnetMaskV6", subnetMaskV6);
+            field_from_json(Obj, "defaultGatewayV6", defaultGatewayV6);
+            field_from_json(Obj, "primaryDnsV6", primaryDnsV6);
+            field_from_json(Obj, "secondaryDnsV6", secondaryDnsV6);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void WifiNetwork::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "type", type);
+        field_to_json(Obj, "name", name);
+        field_to_json(Obj, "password", password);
+        field_to_json(Obj, "encryption", encryption);
+        field_to_json(Obj, "bands", bands);
+    }
+
+    bool WifiNetwork::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "type", type);
+            field_from_json(Obj, "name", name);
+            field_from_json(Obj, "password", password);
+            field_from_json(Obj, "encryption", encryption);
+            field_from_json(Obj, "bands", bands);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void WifiNetworkList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "wifiNetworks", wifiNetworks);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+    }
+
+    bool WifiNetworkList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "wifiNetworks", wifiNetworks);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void AccessTime::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "day", day);
+        field_to_json(Obj, "rangeList", rangeList);
+    }
+
+    bool AccessTime::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "day", day);
+            field_from_json(Obj, "rangeList", rangeList);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void AccessTimes::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "schedule", schedule);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+    }
+
+    bool AccessTimes::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "schedule", schedule);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void SubscriberDevice::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "name", name);
+        field_to_json(Obj, "description", description);
+        field_to_json(Obj, "macAddress", macAddress);
+        field_to_json(Obj, "manufacturer", manufacturer);
+        field_to_json(Obj, "firstContact", firstContact);
+        field_to_json(Obj, "lastContact", lastContact);
+        field_to_json(Obj, "group", group);
+        field_to_json(Obj, "icon", icon);
+        field_to_json(Obj, "suspended", suspended);
+        field_to_json(Obj, "ip", ip);
+        field_to_json(Obj, "schedule", schedule);
+    }
+
+    bool SubscriberDevice::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "name", name);
+            field_from_json(Obj, "description", description);
+            field_from_json(Obj, "macAddress", macAddress);
+            field_from_json(Obj, "manufacturer", manufacturer);
+            field_from_json(Obj, "firstContact", firstContact);
+            field_from_json(Obj, "lastContact", lastContact);
+            field_from_json(Obj, "group", group);
+            field_from_json(Obj, "icon", icon);
+            field_from_json(Obj, "suspended", suspended);
+            field_from_json(Obj, "ip", ip);
+            field_from_json(Obj, "schedule", schedule);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void SubscriberDeviceList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "devices", devices);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+    }
+
+    bool SubscriberDeviceList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "devices", devices);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void Association::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "name", name);
+        field_to_json(Obj, "ssid", ssid);
+        field_to_json(Obj, "macAddress", macAddress);
+        field_to_json(Obj, "rssi", rssi);
+        field_to_json(Obj, "power", power);
+        field_to_json(Obj, "ipv4", ipv4);
+        field_to_json(Obj, "ipv6", ipv6);
+        field_to_json(Obj, "tx", tx);
+        field_to_json(Obj, "rx", rx);
+        field_to_json(Obj, "manufacturer", manufacturer);
+    }
+
+    bool Association::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "name", name);
+            field_from_json(Obj, "ssid", ssid);
+            field_from_json(Obj, "macAddress", macAddress);
+            field_from_json(Obj, "rssi", rssi);
+            field_from_json(Obj, "power", power);
+            field_from_json(Obj, "ipv4", ipv4);
+            field_from_json(Obj, "ipv6", ipv6);
+            field_from_json(Obj, "tx", tx);
+            field_from_json(Obj, "rx", rx);
+            field_from_json(Obj, "manufacturer", manufacturer);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void AssociationList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "associations", associations);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+    }
+
+    bool AssociationList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "associations", associations);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void Client::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "macAddress", macAddress);
+        field_to_json(Obj, "speed", speed);
+        field_to_json(Obj, "mode", mode);
+        field_to_json(Obj, "ipv4", ipv4);
+        field_to_json(Obj, "ipv6", ipv6);
+        field_to_json(Obj, "tx", tx);
+        field_to_json(Obj, "rx", rx);
+        field_to_json(Obj, "manufacturer", manufacturer);
+    }
+
+    bool Client::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "macAddress", macAddress);
+            field_from_json(Obj, "speed", speed);
+            field_from_json(Obj, "mode", mode);
+            field_from_json(Obj, "ipv4", ipv4);
+            field_from_json(Obj, "ipv6", ipv6);
+            field_from_json(Obj, "tx", tx);
+            field_from_json(Obj, "rx", rx);
+            field_from_json(Obj, "manufacturer", manufacturer);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void ClientList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "clients", clients);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+    }
+
+    bool ClientList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "clients", clients);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void Location::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "buildingName", buildingName);
+        field_to_json(Obj, "addressLines", addressLines);
+        field_to_json(Obj, "city", city);
+        field_to_json(Obj, "state", state);
+        field_to_json(Obj, "postal", postal);
+        field_to_json(Obj, "country", country);
+        field_to_json(Obj, "phones", phones);
+        field_to_json(Obj, "mobiles", mobiles);
+    }
+
+    bool Location::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "buildingName", buildingName);
+            field_from_json(Obj, "addressLines", addressLines);
+            field_from_json(Obj, "city", city);
+            field_from_json(Obj, "state", state);
+            field_from_json(Obj, "postal", postal);
+            field_from_json(Obj, "country", country);
+            field_from_json(Obj, "phones", phones);
+            field_from_json(Obj, "mobiles", mobiles);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void RadioHE::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "multipleBSSID", multipleBSSID);
+        field_to_json(Obj, "ema", ema);
+        field_to_json(Obj, "bssColor", bssColor);
+    }
+
+    bool RadioHE::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "multipleBSSID", multipleBSSID);
+            field_from_json(Obj, "ema", ema);
+            field_from_json(Obj, "bssColor", bssColor);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void RadioRates::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "beacon", beacon);
+        field_to_json(Obj, "multicast", multicast);
+    }
+
+    bool RadioRates::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "beacon", beacon);
+            field_from_json(Obj, "multicast", multicast);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void RadioInformation::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "band", band);
+        field_to_json(Obj, "bandwidth", bandwidth);
+        field_to_json(Obj, "channel", channel);
+        field_to_json(Obj, "country", country);
+        field_to_json(Obj, "channelMode", channelMode);
+        field_to_json(Obj, "channelWidth", channelWidth);
+        field_to_json(Obj, "requireMode", requireMode);
+        field_to_json(Obj, "txpower", txpower);
+        field_to_json(Obj, "legacyRates", legacyRates);
+        field_to_json(Obj, "beaconInterval", beaconInterval);
+        field_to_json(Obj, "dtimPeriod", dtimPeriod);
+        field_to_json(Obj, "maximumClients", maximumClients);
+        field_to_json(Obj, "rates", rates);
+        field_to_json(Obj, "he", he);
+        field_to_json(Obj, "rawInfo", rawInfo);
+        field_to_json(Obj, "allowDFS", allowDFS);
+        field_to_json(Obj, "mimo", mimo);
+    }
+
+    bool RadioInformation::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "band", band);
+            field_from_json(Obj, "bandwidth", bandwidth);
+            field_from_json(Obj, "channel", channel);
+            field_from_json(Obj, "country", country);
+            field_from_json(Obj, "channelMode", channelMode);
+            field_from_json(Obj, "channelWidth", channelWidth);
+            field_from_json(Obj, "requireMode", requireMode);
+            field_from_json(Obj, "txpower", txpower);
+            field_from_json(Obj, "legacyRates", legacyRates);
+            field_from_json(Obj, "beaconInterval", beaconInterval);
+            field_from_json(Obj, "dtimPeriod", dtimPeriod);
+            field_from_json(Obj, "maximumClients", maximumClients);
+            field_from_json(Obj, "rates", rates);
+            field_from_json(Obj, "he", he);
+            field_from_json(Obj, "rawInfo", rawInfo);
+            field_from_json(Obj, "allowDFS", allowDFS);
+            field_from_json(Obj, "mimo", mimo);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void AccessPoint::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "id", id);
+        field_to_json(Obj, "macAddress", macAddress);
+        field_to_json(Obj, "serialNumber", serialNumber);
+        field_to_json(Obj, "name", name);
+        field_to_json(Obj, "deviceType", deviceType);
+        field_to_json(Obj, "subscriberDevices", subscriberDevices);
+        field_to_json(Obj, "ipReservations", ipReservations);
+        field_to_json(Obj, "address", address);
+        field_to_json(Obj, "wifiNetworks", wifiNetworks);
+        field_to_json(Obj, "internetConnection", internetConnection);
+        field_to_json(Obj, "deviceMode", deviceMode);
+        field_to_json(Obj, "dnsConfiguration", dnsConfiguration);
+        field_to_json(Obj, "radios", radios);
+        field_to_json(Obj, "automaticUpgrade", automaticUpgrade);
+        field_to_json(Obj, "configurationUUID", configurationUUID);
+        field_to_json(Obj, "currentFirmware", currentFirmware);
+        field_to_json(Obj, "currentFirmwareDate", currentFirmwareDate);
+        field_to_json(Obj, "latestFirmware", latestFirmware);
+        field_to_json(Obj, "latestFirmwareDate", latestFirmwareDate);
+        field_to_json(Obj, "newFirmwareAvailable", newFirmwareAvailable);
+        field_to_json(Obj, "latestFirmwareURI", latestFirmwareURI);
+    }
+
+    bool AccessPoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "id", id);
+            field_from_json(Obj, "macAddress", macAddress);
+            field_from_json(Obj, "serialNumber", serialNumber);
+            field_from_json(Obj, "name", name);
+            field_from_json(Obj, "deviceType", deviceType);
+            field_from_json(Obj, "subscriberDevices", subscriberDevices);
+            field_from_json(Obj, "ipReservations", ipReservations);
+            field_from_json(Obj, "address", address);
+            field_from_json(Obj, "wifiNetworks", wifiNetworks);
+            field_from_json(Obj, "internetConnection", internetConnection);
+            field_from_json(Obj, "deviceMode", deviceMode);
+            field_from_json(Obj, "dnsConfiguration", dnsConfiguration);
+            field_from_json(Obj, "radios", radios);
+            field_from_json(Obj, "automaticUpgrade", automaticUpgrade);
+            field_from_json(Obj, "configurationUUID", configurationUUID);
+            field_from_json(Obj, "currentFirmware", currentFirmware);
+            field_from_json(Obj, "currentFirmwareDate", currentFirmwareDate);
+            field_from_json(Obj, "latestFirmware", latestFirmware);
+            field_from_json(Obj, "latestFirmwareDate", latestFirmwareDate);
+            field_from_json(Obj, "newFirmwareAvailable", newFirmwareAvailable);
+            field_from_json(Obj, "latestFirmwareURI", latestFirmwareURI);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void AccessPointList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "list", list);
+    }
+
+    bool AccessPointList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "list", list);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void SubscriberInfo::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "id", id);
+        field_to_json(Obj, "userId", userId);
+        field_to_json(Obj, "firstName", firstName);
+        field_to_json(Obj, "initials", initials);
+        field_to_json(Obj, "lastName", lastName);
+        field_to_json(Obj, "phoneNumber", phoneNumber);
+        field_to_json(Obj, "secondaryEmail", secondaryEmail);
+        field_to_json(Obj, "accessPoints", accessPoints);
+        field_to_json(Obj, "serviceAddress", serviceAddress);
+        field_to_json(Obj, "billingAddress", billingAddress);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "modified", modified);
+    }
+
+    bool SubscriberInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "id", id);
+            field_from_json(Obj, "userId", userId);
+            field_from_json(Obj, "firstName", firstName);
+            field_from_json(Obj, "initials", initials);
+            field_from_json(Obj, "lastName", lastName);
+            field_from_json(Obj, "phoneNumber", phoneNumber);
+            field_from_json(Obj, "secondaryEmail", secondaryEmail);
+            field_from_json(Obj, "accessPoints", accessPoints);
+            field_from_json(Obj, "serviceAddress", serviceAddress);
+            field_from_json(Obj, "billingAddress", billingAddress);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void StatsEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "timestamp", timestamp);
+        field_to_json(Obj, "tx", tx);
+        field_to_json(Obj, "rx", rx);
+    }
+
+    bool StatsEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "timestamp", timestamp);
+            field_from_json(Obj, "tx", tx);
+            field_from_json(Obj, "rx", rx);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+
+    void StatsBlock::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "modified", modified);
+        field_to_json(Obj, "external", external);
+        field_to_json(Obj, "internal", internal);
+    }
+
+    bool StatsBlock::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "modified", modified);
+            field_from_json(Obj, "external", external);
+            field_from_json(Obj, "internal", internal);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
+}

src/RESTObjects/RESTAPI_SubObjects.h

@@ -0,0 +1,322 @@
+//
+// Created by stephane bourque on 2021-10-27.
+//
+
+#ifndef OWSUB_RESTAPI_SUBOBJECTS_H
+#define OWSUB_RESTAPI_SUBOBJECTS_H
+
+#include <string>
+
+#include "Poco/JSON/Object.h"
+
+namespace OpenWifi::SubObjects {
+
+    struct HomeDeviceMode {
+        bool            enableLEDS = true;
+        std::string     type;       // bridge, manual, automatic
+        std::string     subnet;
+        std::string     subnetMask;
+        std::string     startIP;
+        std::string     endIP;
+        uint64_t        created = 0 ;
+        uint64_t        modified = 0 ;
+        std::string     subnetV6;
+        int             subnetMaskV6=0;
+        std::string     startIPV6;
+        std::string     endIPV6;
+        std::string     leaseTime;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct IPReservation  {
+        std::string     nickname;
+        std::string     ipAddress;
+        std::string     macAddress;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct IPReservationList {
+        std::string                 id;
+        std::vector<IPReservation>  reservations;
+        uint64_t created = 0 ;
+        uint64_t modified = 0 ;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct DnsConfiguration {
+        bool            ISP=false;
+        bool            custom=false;
+        std::string     primary;
+        std::string     secondary;
+        std::string     primaryV6;
+        std::string     secondaryV6;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct InternetConnection {
+        std::string     type; // automatic, pppoe, manual
+        std::string     username;
+        std::string     password;
+        std::string     ipAddress;
+        std::string     subnetMask;
+        std::string     defaultGateway;
+        bool            sendHostname = true;
+        std::string     primaryDns;
+        std::string     secondaryDns;
+        uint64_t        created=0;
+        uint64_t        modified=0;
+        bool            ipV6Support=false;
+        std::string     ipAddressV6;
+        int             subnetMaskV6=0;
+        std::string     defaultGatewayV6;
+        std::string     primaryDnsV6;
+        std::string     secondaryDnsV6;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct WifiNetwork {
+        std::string     type;       // main, guest
+        std::string     name;
+        std::string     password;
+        std::string     encryption;
+        std::vector<std::string>    bands;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct WifiNetworkList {
+        std::vector<WifiNetwork>    wifiNetworks;
+        uint64_t                    created=0;
+        uint64_t                    modified=0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct AccessTime {
+        std::string day;
+        std::vector<std::string>    rangeList;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct AccessTimes {
+        std::vector<AccessTime> schedule;
+        uint64_t        created=0;
+        uint64_t        modified=0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct SubscriberDevice {
+        std::string     name;
+        std::string     description;
+        std::string     macAddress;
+        std::string     manufacturer;
+        uint64_t        firstContact=0;
+        uint64_t        lastContact=0;
+        std::string     group;
+        std::string     icon;
+        bool            suspended=false;
+        std::string     ip;
+        std::vector<AccessTimes>    schedule;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct SubscriberDeviceList {
+        std::vector<SubscriberDevice>   devices;
+        uint64_t        created=0;
+        uint64_t        modified=0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct Association {
+        std::string     name;
+        std::string     ssid;
+        std::string     macAddress;
+        int             rssi=0;
+        int             power=0;
+        std::string     ipv4;
+        std::string     ipv6;
+        uint64_t        tx=0;
+        uint64_t        rx=0;
+        std::string     manufacturer;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct AssociationList {
+        std::vector<Association>    associations;
+        uint64_t        created=0;
+        uint64_t        modified=0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct Client {
+        std::string     macAddress;
+        std::string     speed;
+        std::string     mode;
+        std::string     ipv4;
+        std::string     ipv6;
+        uint64_t        tx=0;
+        uint64_t        rx=0;
+        std::string     manufacturer;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct ClientList {
+        std::vector<Client> clients;
+        uint64_t        created=0;
+        uint64_t        modified=0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct Location {
+        std::string                 buildingName;
+        std::vector<std::string>    addressLines;
+        std::string                 city;
+        std::string                 state;
+        std::string                 postal;
+        std::string                 country;
+        std::vector<std::string>    phones;
+        std::vector<std::string>    mobiles;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct RadioHE {
+        bool                        multipleBSSID = false;
+        bool                        ema = false;
+        uint64_t                    bssColor = 64;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct RadioRates {
+        uint64_t                    beacon = 6000;
+        uint64_t                    multicast = 24000;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct RadioInformation {
+        std::string             band;
+        uint64_t                bandwidth;
+        uint64_t                channel = 0 ;
+        std::string             country;
+        std::string             channelMode{"HE"};
+        uint64_t                channelWidth = 80;
+        std::string             requireMode;
+        uint64_t                txpower=0;
+        bool                    legacyRates = false;
+        uint64_t                beaconInterval = 100;
+        uint64_t                dtimPeriod = 2;
+        uint64_t                maximumClients = 64;
+        RadioRates              rates;
+        RadioHE                 he;
+        bool                    allowDFS=false;
+        std::string             mimo;
+        std::vector<std::string>    rawInfo;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct AccessPoint {
+        std::string                 id;
+        std::string                 macAddress;
+        std::string                 serialNumber;
+        std::string                 name;
+        std::string                 deviceType;
+        SubscriberDeviceList        subscriberDevices;
+        IPReservationList           ipReservations;
+        Location                    address;
+        WifiNetworkList             wifiNetworks;
+        InternetConnection          internetConnection;
+        HomeDeviceMode              deviceMode;
+        DnsConfiguration            dnsConfiguration;
+        std::vector<RadioInformation>   radios;
+        bool                        automaticUpgrade = true;
+        std::string                 configurationUUID;
+        std::string                 currentFirmware;
+        uint64_t                    currentFirmwareDate;
+        std::string                 latestFirmware;
+        uint64_t                    latestFirmwareDate;
+        bool                        newFirmwareAvailable;
+        std::string                 latestFirmwareURI;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct AccessPointList {
+        std::vector<AccessPoint>   list;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct SubscriberInfo {
+        std::string                 id;
+        std::string                 userId;
+        std::string                 firstName;
+        std::string                 initials;
+        std::string                 lastName;
+        std::string                 phoneNumber;
+        std::string                 secondaryEmail;
+        AccessPointList             accessPoints;
+        Location                    serviceAddress;
+        Location                    billingAddress;
+        uint64_t                    created = 0;
+        uint64_t                    modified = 0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct StatsEntry {
+        uint64_t        timestamp=0;
+        uint64_t        tx=0;
+        uint64_t        rx=0;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    struct StatsBlock {
+        uint64_t                    modified=0;
+        std::vector<StatsEntry>     external, internal;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+}
+
+#endif //OWSUB_RESTAPI_SUBOBJECTS_H

src/SDK/GW_SDK.cpp

@@ -0,0 +1,39 @@
+//
+// Created by stephane bourque on 2021-10-05.
+//
+
+#include "GW_SDK.h"
+#include "Daemon.h"
+#include "Poco/Net/HTTPResponse.h"
+
+namespace OpenWifi::SDK::GW {
+
+    bool SendFirmwareUpgradeCommand( const std::string & serialNumber, const std::string & URI, [[maybe_unused]] uint64_t When  ) {
+        Types::StringPairVec    QueryData;
+        Poco::JSON::Object      Body;
+
+        Body.set("serialNumber", serialNumber);
+        Body.set("uri", URI);
+        Body.set("when",0);
+
+        OpenWifi::OpenAPIRequestPost R(OpenWifi::uSERVICE_GATEWAY,
+                                       "/api/v1/device/" + serialNumber + "/upgrade" ,
+                                      QueryData,
+                                      Body,
+                                      10000);
+        Poco::JSON::Object::Ptr Response;
+        if(R.Do(Response) == Poco::Net::HTTPResponse::HTTP_OK) {
+            std::ostringstream os;
+            Poco::JSON::Stringifier::stringify(Response,os);
+            std::cout << "FirmwareUpgradeCommand - good - response: " << os.str() << std::endl;
+            return true;
+        } else {
+            std::ostringstream os;
+            Poco::JSON::Stringifier::stringify(Response,os);
+            std::cout << "FirmwareUpgradeCommand - bad - response: " << os.str() << std::endl;
+        }
+
+        return false;
+    }
+
+}

src/SDK/GW_SDK.h

@@ -0,0 +1,17 @@
+//
+// Created by stephane bourque on 2021-10-05.
+//
+
+#ifndef OWFMS_GW_SDK_H
+#define OWFMS_GW_SDK_H
+
+
+#include "framework/MicroService.h"
+
+namespace OpenWifi::SDK::GW {
+
+    bool SendFirmwareUpgradeCommand( const std::string & serialNumber, const std::string & URI, uint64_t When = 0 );
+
+};
+
+#endif //OWFMS_GW_SDK_H

src/SDK/Prov_SDK.cpp

@@ -0,0 +1,42 @@
+//
+// Created by stephane bourque on 2021-10-04.
+//
+
+#include "framework/MicroService.h"
+
+namespace OpenWifi::SDK::Prov {
+    bool GetFirmwareOptions( const std::string & serialNumber, std::string &firmwareUpgrade,
+                             bool &firmwareRCOnly) {
+
+        Types::StringPairVec    QueryData;
+        QueryData.push_back(std::make_pair("firmwareOptions","true"));
+
+        OpenWifi::OpenAPIRequestGet R(  OpenWifi::uSERVICE_PROVISIONING,
+                                        "/api/v1/inventory/" +serialNumber,
+                                      QueryData,
+                                      10000);
+        firmwareUpgrade="no";
+        firmwareRCOnly=false;
+        Poco::JSON::Object::Ptr Response;
+        if(R.Do(Response) == Poco::Net::HTTPResponse::HTTP_OK) {
+            std::cout << "Received options... " << std::endl;
+            std::ostringstream os;
+            Poco::JSON::Stringifier::stringify(Response,os);
+            std::cout << "Firmware option response - good - Response: " << os.str() << std::endl;
+
+            if(Response->has("firmwareUpgrade"))
+                firmwareUpgrade = Response->get("firmwareUpgrade").toString();
+            if(Response->has("firmwareRCOnly"))
+                firmwareRCOnly = Response->get("firmwareRCOnly").toString()=="true";
+            return true;
+        } else {
+            std::cout << "Failed Received options... " << std::endl;
+            std::ostringstream os;
+            Poco::JSON::Stringifier::stringify(Response,os);
+            std::cout << "Firmware option response - bad- Response: " << os.str() << std::endl;
+        }
+
+        return false;
+    }
+
+}

src/SDK/Prov_SDK.h

@@ -0,0 +1,18 @@
+//
+// Created by stephane bourque on 2021-10-04.
+//
+
+#ifndef OWFMS_PROV_SDK_H
+#define OWFMS_PROV_SDK_H
+
+#include "framework/MicroService.h"
+
+namespace OpenWifi::SDK::Prov {
+
+    bool GetFirmwareOptions( const std::string & serialNumber, std::string &firmwareUpgrade,
+                             bool &firmwareRCOnly);
+
+};
+
+
+#endif //OWFMS_PROV_SDK_H

src/StorageService.cpp

@@ -6,63 +6,30 @@
 //	Arilia Wireless Inc.
 //
 
-#include <fstream>
 #include "StorageService.h"
-#include "Poco/Util/Application.h"
-
-#include "Daemon.h"
-
-#include "Utils.h"
 
 namespace OpenWifi {
 
-    class Storage *Storage::instance_ = nullptr;
-
-	std::string Storage::ConvertParams(const std::string & S) const {
-		std::string R;
-
-		R.reserve(S.size()*2+1);
-
-		if(false) {
-			auto Idx=1;
-			for(auto const & i:S)
-			{
-				if(i=='?') {
-					R += '$';
-					R.append(std::to_string(Idx++));
-				} else {
-					R += i;
-				}
-			}
-		} else {
-			R = S;
-		}
-		return R;
-	}
-
     int Storage::Start() {
         std::lock_guard		Guard(Mutex_);
 
-        Logger_.setLevel(Poco::Message::PRIO_NOTICE);
-        Logger_.notice("Starting.");
-        std::string DBType = Daemon()->ConfigGetString("storage.type");
+        StorageClass::Start();
 
-        if (DBType == "sqlite") {
-            Setup_SQLite();
-        } else if (DBType == "postgresql") {
-            Setup_PostgreSQL();
-        } else if (DBType == "mysql") {
-            Setup_MySQL();
-        }
+        HistoryDB_ = std::make_unique<OpenWifi::HistoryDB>(dbType_,*Pool_, Logger());
+        FirmwaresDB_ = std::make_unique<OpenWifi::FirmwaresDB>(dbType_,*Pool_, Logger());
+        DevicesDB_ = std::make_unique<OpenWifi::DevicesDB>(dbType_,*Pool_, Logger());
 
-        Create_Tables();
+        HistoryDB_->Create();
+        FirmwaresDB_->Create();
+        DevicesDB_->Create();
 
         return 0;
     }
 
     void Storage::Stop() {
         std::lock_guard		Guard(Mutex_);
-        Logger_.notice("Stopping.");
+        Logger().notice("Stopping.");
+        StorageClass::Stop();
     }
 
     std::string Storage::TrimRevision(const std::string &R) {

src/StorageService.h

@@ -9,112 +9,47 @@
 #ifndef UCENTRAL_USTORAGESERVICE_H
 #define UCENTRAL_USTORAGESERVICE_H
 
-#include "Poco/Data/Session.h"
-#include "Poco/Data/SessionPool.h"
-#include "Poco/Data/SQLite/Connector.h"
-#include "Poco/JSON/Object.h"
+#include "framework/MicroService.h"
+#include "framework/StorageClass.h"
 
-#include "RESTAPI_FMSObjects.h"
-#include "SubSystemServer.h"
+#include "RESTObjects/RESTAPI_FMSObjects.h"
 
-#include "storage_firmwares.h"
-#include "storage_history.h"
-#include "storage_deviceTypes.h"
-#include "storage_deviceInfo.h"
-
-#ifndef SMALL_BUILD
-#include "Poco/Data/PostgreSQL/Connector.h"
-#include "Poco/Data/MySQL/Connector.h"
-#endif
+#include "storage/orm_history.h"
+#include "storage/orm_firmwares.h"
+#include "storage/orm_deviceInfo.h"
 
 namespace OpenWifi {
 
-    class Storage : public SubSystemServer {
+    class Storage : public StorageClass {
     public:
 
-        enum StorageType {
-            sqlite,
-            pgsql,
-            mysql
-        };
-
-        int Create_Tables();
-        int Create_Firmwares();
-        int Create_History();
-        int Create_DeviceTypes();
-        int Create_DeviceInfo();
-
-        bool AddFirmware(FMSObjects::Firmware & F);
-        bool UpdateFirmware(std::string & UUID, FMSObjects::Firmware & C);
-        bool DeleteFirmware(std::string & UUID);
-        bool GetFirmware(std::string & UUID, FMSObjects::Firmware & C);
-        bool GetFirmwares(uint64_t From, uint64_t HowMany, std::string & Compatible, FMSObjects::FirmwareVec & Firmwares);
-        bool BuildFirmwareManifest(Poco::JSON::Object & Manifest, uint64_t & Version);
-        bool GetFirmwareByName(std::string & Release, std::string &DeviceType,FMSObjects::Firmware & C );
-        bool GetFirmwareByRevision(std::string & Revision, std::string &DeviceType,FMSObjects::Firmware & C );
-        bool ComputeFirmwareAge(std::string & DeviceType, std::string & Revision, FMSObjects::FirmwareAgeDetails &AgeDetails);
-
-        bool GetHistory(std::string &SerialNumber,uint64_t From, uint64_t HowMany,FMSObjects::RevisionHistoryEntryVec &History);
-        bool AddHistory(FMSObjects::RevisionHistoryEntry &History);
-
-        void PopulateLatestFirmwareCache();
-        void RemoveOldFirmware();
-
         int 	Start() override;
         void 	Stop() override;
 
-        [[nodiscard]] std::string ConvertParams(const std::string &S) const;
-        [[nodiscard]] inline std::string ComputeRange(uint64_t From, uint64_t HowMany) {
-            if(dbType_==sqlite) {
-                return " LIMIT " + std::to_string(From-1) + ", " + std::to_string(HowMany) + " ";
-            } else if(dbType_==pgsql) {
-                return " LIMIT " + std::to_string(HowMany) + " OFFSET " + std::to_string(From-1) + " ";
-            } else if(dbType_==mysql) {
-                return " LIMIT " + std::to_string(HowMany) + " OFFSET " + std::to_string(From-1) + " ";
-            }
-            return " LIMIT " + std::to_string(HowMany) + " OFFSET " + std::to_string(From-1) + " ";
-        }
+        int Create_Tables();
+        int Create_DeviceTypes();
+        int Create_DeviceInfo();
 
-        bool    SetDeviceRevision(std::string &SerialNumber, std::string & Revision, std::string & DeviceType, std::string &EndPoint);
+        bool BuildFirmwareManifest(Poco::JSON::Object & Manifest, uint64_t & Version);
 
-        bool AddHistory( std::string & SerialNumber, std::string &DeviceType, std::string & PreviousRevision, std::string & NewVersion);
-        bool DeleteHistory( std::string & SerialNumber, std::string &Id);
-
-        bool GetDevices(uint64_t From, uint64_t HowMany, std::vector<FMSObjects::DeviceConnectionInformation> & Devices);
-        bool GetDevice(std::string &SerialNumber, FMSObjects::DeviceConnectionInformation & Device);
-        bool SetDeviceDisconnected(std::string &SerialNumber, std::string &EndPoint);
-
-        bool GenerateDeviceReport(FMSObjects::DeviceReport &Report);
         static std::string TrimRevision(const std::string &R);
-        static Storage *instance() {
-            if (instance_ == nullptr) {
-                instance_ = new Storage;
-            }
+        static auto instance() {
+            static auto instance_ = new Storage;
             return instance_;
         }
 
+        OpenWifi::HistoryDB & HistoryDB() { return * HistoryDB_; }
+        OpenWifi::FirmwaresDB & FirmwaresDB() { return * FirmwaresDB_; }
+        OpenWifi::DevicesDB & DevicesDB() { return * DevicesDB_; }
+
 	  private:
-		static Storage      							    *instance_;
-		std::unique_ptr<Poco::Data::SessionPool>            Pool_= nullptr;
-        StorageType 										dbType_ = sqlite;
-        std::unique_ptr<Poco::Data::SQLite::Connector>  	SQLiteConn_= nullptr;
-#ifndef SMALL_BUILD
-        std::unique_ptr<Poco::Data::PostgreSQL::Connector>  PostgresConn_= nullptr;
-        std::unique_ptr<Poco::Data::MySQL::Connector>       MySQLConn_= nullptr;
-#endif
-
-        Storage() noexcept:
-                SubSystemServer("Storage", "STORAGE-SVR", "storage")
-        {
-        }
-
-        int 	Setup_SQLite();
-        int 	Setup_MySQL();
-        int 	Setup_PostgreSQL();
 
+        std::unique_ptr<OpenWifi::HistoryDB>        HistoryDB_;
+        std::unique_ptr<OpenWifi::FirmwaresDB>      FirmwaresDB_;
+        std::unique_ptr<OpenWifi::DevicesDB>        DevicesDB_;
     };
 
-    inline Storage * Storage() { return Storage::instance(); };
+    inline auto StorageService() { return Storage::instance(); };
 
 }  // namespace