Remove license (#46)

* Removed activation license

* Removing license stuff

* Updated changes file

Author: OskarLiew

.github/workflows/provision.yml

@@ -11,10 +11,6 @@ on:
         description: 'Version to be provisioned'
         required: true
         default: 'latest'
-      activation_key:
-        description: 'License Activation Key'
-        required: false
-        default: ''
       secured:
         description: 'Use HTTPS (SSL), -H for yes, empty for no'
         required: false
@@ -53,7 +49,6 @@ jobs:
       uses: appleboy/ssh-action@master
       env:
         HOST: ${{ github.event.inputs.host_name }}
-        ACTIVATION_KEY: ${{ github.event.inputs.activation_key }}
         SECURED: ${{ github.event.inputs.secured }}
         VERSION: ${{ github.event.inputs.version }}
         ADMIN_PASSWORD: ${{ github.event.inputs.admin_password }}
@@ -63,5 +58,5 @@ jobs:
         username: manager
         key: ${{ secrets.MANAGER_SSH_KEY }}
         port: 22
-        envs: HOST,ACTIVATION_KEY,SECURED,VERSION,ADMIN_PASSWORD
-        script: bash start_manager -n $HOST -k $ACTIVATION_KEY $SECURED -v $VERSION -w $ADMIN_PASSWORD -A $EXTRA_OPTIONS
+        envs: HOST,SECURED,VERSION,ADMIN_PASSWORD
+        script: bash start_manager -n $HOST $SECURED -v $VERSION -w $ADMIN_PASSWORD -A $EXTRA_OPTIONS

CHANGES.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Dev
+
+### New Features
+
+- It is no longer necessary to activate Daeploy with a license to get indefinite access
+
 ## 1.2.0
 
 ### New Features

docs/source/content/advanced_tutorials/manager_configuration.rst

@@ -35,8 +35,6 @@ The Manager is highly configurable using environment variables.
 +--------------------------------------------+-----------------------+-------------------------------------------------------------+
 | DAEPLOY_NOTIFICATION_SMTP_PORT             | null                  | Port to SMTP server, usually 587 or 465.                    |
 +--------------------------------------------+-----------------------+-------------------------------------------------------------+
-| DAEPLOY_ACTIVATION_KEY                     | ""                    | License activation key. Without key Manager lives for 12h.  |
-+--------------------------------------------+-----------------------+-------------------------------------------------------------+
 | DAEPLOY_ADMIN_PASSWORD                     | admin                 | Password for the admin user. Defualt to admin.              |
 +--------------------------------------------+-----------------------+-------------------------------------------------------------+
 
@@ -141,7 +139,7 @@ Below we show an example of a typical production setup using the Docker CLI
 and the
 `start_manager script <https://github.com/vikinganalytics/daeploy-examples/blob/master/start_manager>`_.
 In the example we start a Manager instance listening on ``my.domain.com``, with HTTPS,
-authentication, an activated license and email notifications enabled.
+authentication and email notifications enabled.
 
 Docker CLI
 ^^^^^^^^^^
@@ -160,7 +158,6 @@ Docker CLI
         -e DAEPLOY_HOST_NAME=my.domain.com \
         -e DAEPLOY_PROXY_HTTPS=True \
         -e DAEPLOY_AUTH_ENABLED=True \
-        -e DAEPLOY_ACTIVATION_KEY=... \
         -e DAEPLOY_ADMIN_PASSWORD=... \
         -e DAEPLOY_CONFIG_EMAIL=<some@email.com> \
         -e DAEPLOY_CONFIG_EMAIL_PASSWORD=<password for some@email.com> \
@@ -189,7 +186,6 @@ manager settings available.
         --host-name my.domain.com \
         --auth-enabled \
         --https-enabled \
-        --activation-key ... \
         --admin-password ... \
         --config-email ... \
         --config-password ... \

docs/source/content/getting_started/getting_started.rst

@@ -23,13 +23,12 @@ The Daeploy python library can be installed with `pip <https://pypi.org/project/
 
 Check your installation by running: ``daeploy --help`` in a terminal.
 
-You will also need a manager container. To start a free trial
+You will also need a manager container. To start a
 manager running on ``localhost`` for development, run the following command:
 
 >>> docker run -v /var/run/docker.sock:/var/run/docker.sock -p 80:80 -p 443:443 -d daeploy/manager:latest  # doctest: +SKIP
 
 You can check that it started correctly by opening http://localhost/ in your browser.
-The trial manager can be used without restrictions for 12 hours before it has to be restarted.
 
 .. warning:: This configuration should **never** be used in production. It is missing crucial
     features such as authentication and secured communication. Please refer to

manager/app.py

@@ -14,7 +14,6 @@
     logging_api,
 )
 from manager import proxy
-from manager.license import activation_key_reader_on_startup, validity_door_man
 from manager.database.database import initialize_db
 from manager.database import service_db
 from manager.constants import get_manager_version
@@ -77,11 +76,6 @@ def startup_event():
     recreate_proxy_configurations()
 
 
-# License handling
-app.on_event("startup")(activation_key_reader_on_startup)
-app.middleware("http")(validity_door_man)
-
-
 def recreate_proxy_configurations():
     """Use database to recreate proxy configuration files for running services"""
     services = service_db.get_all_services_db()

manager/constants.py

@@ -115,9 +115,5 @@ def notification_email_config():
     return sender_email, sender_pass, smtp_server, smtp_port
 
 
-def get_activation_key():
-    return os.environ.get("DAEPLOY_ACTIVATION_KEY", "")
-
-
 def get_admin_password():
     return os.environ.get("DAEPLOY_ADMIN_PASSWORD", "admin")

manager/license.py

@@ -6,7 +6,6 @@
 import dash_html_components as html
 from dash.dependencies import Input, Output
 
-import manager.license
 from manager.routers.service_api import read_services, inspect_service
 from manager.routers.notification_api import get_notifications, delete_notifications
 from manager.constants import get_external_proxy_url, get_manager_version
@@ -29,11 +28,6 @@ def build_user_section():
         className="user-actions",
         children=[
             html.P(f"v:{get_manager_version()}", className="version-identifier"),
-            html.P(
-                f"Expiry date: {manager.license.EXPIRATION_TIME.date()}",
-                id="expiry-date",
-                className="version-identifier",
-            ),
             html.P(),
             html.A(
                 "LOGS",
@@ -115,15 +109,6 @@ def build_tabs():
     )
 
 
-@app.callback(
-    Output("expiry-date", "children"),
-    Input("interval1", "n_intervals"),
-)
-# pylint: disable=unused-argument
-def update_expiry_date(interval):
-    return f"Expiry date: {manager.license.EXPIRATION_TIME.date()}"
-
-
 @app.callback(
     Output("app-content", "children"),
     Input("app-tabs", "value"),

manager/routers/dashboard_api.py

@@ -1,6 +1,4 @@
 {
-    "tests/manager_test/license_test.py::test_with_dev_token_1": "INFO     manager.license:license.py:58 Activation code read successfully, validity time updated to: 2030-01-01 00:00:00+00:00\n",
-    "tests/manager_test/license_test.py::test_with_mumbojumbo_token_1": "INFO     manager.routers.auth_api:auth_api.py:97 Token not valid: skjdnblaknsk\nWARNING  manager.license:license.py:47 Could not read activation key successfully!\n",
     "tests/manager_test/proxy_test.py::test_default_config_middlewares_1": [
         {
             "forwardAuth": {

pinned_results.json

@@ -5,7 +5,7 @@
 # Copyright 2020, info@vikinganalytics.se
 # All rights reserved.
 
-# Usage: start_manager [-h|--help] [-v|--version version] [-d|--docker-username docker_username] [-t|--docker-token docker_token] [-n|--host-name host_name] [-p|--http-port http_port] [-P|--https-port https_port] [-A|--auth-enabled] [-l|--log-level log_level] [-a|--disable-access-logs] [-H|--https-enabled] [-s|--https-staging-server] [-e|--config-email email] [-E|--config-password password] [-S|--smtp-server smtp_server] [-N|--smtp-port smtp_port] [-k|--activation-key activation_key]
+# Usage: start_manager [-h|--help] [-v|--version version] [-d|--docker-username docker_username] [-t|--docker-token docker_token] [-n|--host-name host_name] [-p|--http-port http_port] [-P|--https-port https_port] [-A|--auth-enabled] [-l|--log-level log_level] [-a|--disable-access-logs] [-H|--https-enabled] [-s|--https-staging-server] [-e|--config-email email] [-E|--config-password password] [-S|--smtp-server smtp_server] [-N|--smtp-port smtp_port]
 
 # Revision history:
 # 2020-12-21 Created by new_script ver. 3.3
@@ -42,7 +42,7 @@ signal_exit() { # Handle trapped signals
 }
 
 usage() {
-  echo -e "Usage: $PROGNAME -v version [-h|--help] [-d|--docker-username docker_username] [-t|--docker-token docker_token] [-n|--host-name host_name] [-p|--http-port http_port] [-P|--https-port https_port] [-A|--auth-enabled] [-l|--log-level log_level] [-a|--disable-access-logs] [-H|--https-enabled] [-s|--https-staging-server] [-e|--config-email email] [-E|--config-password password] [-S|--smtp-server smtp_server] [-N|--smtp-port smtp_port] [-k|--activation-key activation_key] [-w|--admin-password admin_password]"
+  echo -e "Usage: $PROGNAME -v version [-h|--help] [-d|--docker-username docker_username] [-t|--docker-token docker_token] [-n|--host-name host_name] [-p|--http-port http_port] [-P|--https-port https_port] [-A|--auth-enabled] [-l|--log-level log_level] [-a|--disable-access-logs] [-H|--https-enabled] [-s|--https-staging-server] [-e|--config-email email] [-E|--config-password password] [-S|--smtp-server smtp_server] [-N|--smtp-port smtp_port] [-w|--admin-password admin_password]"
 }
 
 help_message() {
@@ -80,8 +80,6 @@ help_message() {
     Where 'smtp_server' is the smtp server url.
   -N, --smtp-port smtp_port  SMTP server port, usually 465 or 587
     Where 'smtp_port' is the port.
-  -k, --activation-key  License activation key
-    Where 'activation_key' is the activation key.
   -w --admin-password Password for admin user
     Where admin_password is the password for the admin user.
 
@@ -132,8 +130,6 @@ while [[ -n $1 ]]; do
       echo "SMTP email server for sending email notifications"; shift; environ="$environ -e DAEPLOY_NOTIFICATION_SMTP_SERVER=$1" ;;
     -N | --smtp-port)
       echo "SMTP server port, usually 465 or 587"; shift; environ="$environ -e DAEPLOY_NOTIFICATION_SMTP_PORT=$1" ;;
-    -k | --activation-key)
-      echo "License activation key"; shift; environ="$environ -e DAEPLOY_ACTIVATION_KEY=$1" ;;
     -w | --admin-password)
       echo "Admin password"; shift; environ="$environ -e DAEPLOY_ADMIN_PASSWORD=$1" ;;
     -* | --*)