user accounting

.gitignore

@@ -8,3 +8,4 @@ LXDUI.egg-info
 logs/
 conf/lxdui.conf
 snap/
+tmp/

app/__metadata__.py

@@ -1,30 +1,33 @@
 APP_NAME = 'LXDUI'
 APP_CLI_CMD = 'lxdui'
-VERSION = '2.1.2'
+VERSION = '2.2'
 GIT_URL = 'https://github.com/AdaptiveScale/lxdui.git'
 LXD_URL = 'http://localhost:8443'
 LICENSE = 'Apache 2.0'
 AUTHOR = 'AdaptiveScale, Inc.'
 AUTHOR_URL = 'http://www.adaptivescale.com'
 AUTHOR_EMAIL = '[email protected]'
 KEYWORDS = 'lxc lxc-containers lxd'
+IMAGE_HUB = 'http://hub.kuti.io'
 
 '''
 
-The following section is for the default configuration  
-that will be written to the lxdui.conf file if the file 
+The following section is for the default configuration
+that will be written to the lxdui.conf file if the file
 does not already exist.
 
 '''
 AUTO_LOAD_CONFIG = True
 DEFAULT_CONFIG_FORMAT = 'ini'
 __default_config__ = """
 [LXDUI]
+lxdui.host = 0.0.0.0
 lxdui.port = 15151
 lxdui.images.remote = https://images.linuxcontainers.org
+#lxdui.lxd.remote = https://lxd.host.org:8443/
+#lxdui.lxd.sslverify = true
+#lxdui.lxd.remote.name = host
 lxdui.jwt.token.expiration = 1200
-lxdui.jwt.secret.key = AC8d83&21Almnis710sds
-lxdui.jwt.auth.url.rule = /api/user/login
 lxdui.admin.user = admin
 lxdui.conf.dir = {{app_root}}/conf
 lxdui.conf.file = ${lxdui.conf.dir}/lxdui.conf
@@ -41,7 +44,8 @@
 lxdui.zfs.pool.name = lxdpool
 lxdui.app.alias = LXDUI
 lxdui.cli = cli
-
+lxdui.set_limits_cpu = false
+
 [LXDUI_CERT]
 lxdui.cert.country = US
 lxdui.cert.state = Texas

app/api/controllers/auth.py

@@ -0,0 +1,23 @@
+from flask import Blueprint, request, jsonify
+from flask_jwt_extended import create_access_token, get_jwt_identity, jwt_required
+from app.api.utils.authentication import authenticate
+
+auth_api = Blueprint('auth_api', __name__)
+
+@auth_api.route('/login', methods=['POST'])
+def login():
+    username = request.get_json()["username"]
+    password = request.get_json()["password"]
+    auth_resp = authenticate(username,password)
+    if auth_resp == False:
+      return jsonify('{description: "Invalid credentials", error: "Bad Request", status_code: 401}'), 401
+    else:
+      access_token = create_access_token(identity = username)
+      return '{ "access_token": "'+access_token+'" }'
+
+@auth_api.route('/refresh', methods=['POST'])
+@jwt_required()
+def refresh():
+    current_user = get_jwt_identity()
+    access_token = create_access_token(identity=current_user)
+    return '{ "access_token": "'+access_token+'" }'

app/api/controllers/container.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, request
-from flask_jwt import jwt_required
+from flask_jwt_extended import jwt_required
 from app.api.schemas.container_schema import doValidate, doValidateCloneMove, doValidateImageExport
 
 from app.api.models.LXCContainer import LXCContainer
@@ -37,7 +37,7 @@ def getContainer(name):
 @jwt_required()
 def createContainer():
     input = request.get_json(silent=True)
-    validation = doValidate(input)
+    validation = doValidate(input, LXDModule().setLimitsCPU())
     if validation:
         return response.reply(message=validation.message, status=403)
 
@@ -56,7 +56,7 @@ def createContainer():
 @jwt_required()
 def updateContainer():
     input = request.get_json(silent=True)
-    validation = doValidate(input)
+    validation = doValidate(input, LXDModule().setLimitsCPU())
     if validation:
         return response.reply(message=validation.message, status=403)
 
@@ -222,4 +222,4 @@ def removeProxy(name, proxy):
         container = LXCContainer({'name': name})
         return response.replySuccess(container.removeProxy(proxy))
     except ValueError as e:
-        return response.replyFailed(message=e.__str__())
+        return response.replyFailed(message=e.__str__())

app/api/controllers/fileManager.py

@@ -1,10 +1,9 @@
 from flask import Blueprint, request, send_file
 from flask import jsonify
-from flask_jwt import jwt_required
+from flask_jwt_extended import jwt_required
 
 from app.api.models.LXCFileManager import LXCFileManager
 from app.api.utils import response
-from app.api.utils.authentication import jwt_decode_handler
 
 import io
 import json
@@ -113,12 +112,9 @@ def download(name):
 
 
 @file_manager_api.route('/download/container/<string:name>', methods=['GET'])
+@jwt_required()
 def download_file(name):
     path = request.args.get('path')
-    token = request.args.get('token')
-    print (token)
-    if not checkAuthentication(token):
-        return response.replyFailed('Not authorized')
 
     if path == None:
         return jsonify([])
@@ -210,9 +206,3 @@ def delete_profile(name):
     except ValueError as ex:
         return response.replyFailed(message=ex.__str__())
 
-
-def checkAuthentication(token):
-    try:
-        return jwt_decode_handler(token)
-    except Exception as e:
-        return False

app/api/controllers/image.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, request, jsonify
-from flask_jwt import jwt_required
+from flask_jwt_extended import jwt_required
 
 from app.api.models.LXCImage import LXCImage
 from app.api.models.LXDModule import LXDModule
@@ -84,4 +84,36 @@ def downloadImage():
         client = LXDModule()
         return response.replySuccess(client.downloadImage(input.get('image')), message='Image {} downloaded successfully.'.format(input.get('image')))
     except ValueError as e:
-        return response.replyFailed(message=e.__str__())
+        return response.replyFailed(message=e.__str__())
+
+
+import json
+@image_api.route('/hub/publish', methods=['POST'])
+@jwt_required()
+def publishHubImage():
+    #input = request.get_json(silent=True)
+    input = json.loads(request.form.get('input'))
+    logo = request.files['logo']
+    input['logo'] = logo.filename
+    try:
+        client = LXCImage(input)
+        client.exportImage(input, logo)
+        client.pushImage(input)
+        return response.replySuccess(message='Image {} pushed successfully.'.format(input.get('fingerprint')))
+    except ValueError as e:
+        return response.replyFailed(message=e.__str__())
+
+
+@image_api.route('/hub', methods=['POST'])
+@jwt_required()
+def downloadHubImage():
+    input = request.get_json(silent=True)
+    validation = doValidate(input)
+    if validation:
+        return response.replyFailed(message=validation.message)
+    input['fingerprint'] = input.get('image')
+    try:
+        client = LXCImage(input)
+        return response.replySuccess(client.importImage(input), message='Image {} downloaded successfully.'.format(input.get('fingerprint')))
+    except ValueError as e:
+        return response.replyFailed(message=e.__str__())

app/api/controllers/imageRegistry.py

@@ -0,0 +1,29 @@
+from flask import Blueprint, request, send_file
+from flask_jwt_extended import jwt_required
+
+from app.api.models.LXCImage import LXCImage
+from app.api.utils import response
+
+from app.api.schemas.publishImageSchema import doValidate
+
+image_registry_api = Blueprint('image_registry_api', __name__)
+
+
+@image_registry_api.route('/<string:fingerprint>', methods=['POST'])
+@jwt_required()
+def publishImage(fingerprint):
+    input = request.get_json(silent=True)
+    validation = doValidate(input)
+    if validation:
+        return response.replyFailed(message=validation.message)
+
+    input['fingerprint'] = fingerprint
+    try:
+        image = LXCImage({'fingerprint': fingerprint})
+
+        #Export Image - Image registry
+        image.exportImage(input)
+
+        return response.replySuccess(image.getImage())
+    except ValueError as e:
+        return response.replyFailed(message=e.__str__())

app/api/controllers/lxd.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, jsonify
-from flask_jwt import jwt_required
+from flask_jwt_extended import jwt_required
 
 from app.api.models.LXDModule import LXDModule
 from app.api.utils import response
@@ -33,4 +33,4 @@ def config():
         client = LXDModule()
         return response.replySuccess(client.config())
     except ValueError as e:
-        return response.replyFailed(message=e.__str__())
+        return response.replyFailed(message=e.__str__())

app/api/controllers/network.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, request
-from flask_jwt import jwt_required
+from flask_jwt_extended import jwt_required
 
 from app.api.models.LXDModule import LXDModule
 from app.api.models.LXCContainer import LXCContainer
@@ -36,10 +36,11 @@ def updateNetwork(name):
     if validation:
         return response.replyFailed(message=validation.message)
 
+    input['name'] = name
     input['IPv6_ENABLED'] = False
 
-    network = LXCNetwork({'name': name})
-    network.updateNetwork(input, name)
+    network = LXCNetwork(input)
+    network.updateNetwork()
 
     mainConfig = network.info()
     for container in mainConfig['used_by']:
@@ -50,13 +51,14 @@ def updateNetwork(name):
 @jwt_required()
 def creatNetwork(name):
     input = request.get_json(silent=True)
+    input['name'] = name
     validation = doValidate(input)
     if validation:
         return response.replyFailed(message=validation.message)
 
     input['IPv6_ENABLED'] = False
-    network = LXCNetwork({'name': name})
-    network.createNetwork(input, name)
+    network = LXCNetwork(input)
+    network.createNetwork()
 
     mainConfig = network.info()
     return response.replySuccess(mainConfig['result'], message='Network {} created successfully.'.format(name))
@@ -68,4 +70,4 @@ def deleteNetwork(name):
     network.deleteNetwork()
 
     client = LXDModule()
-    return response.replySuccess(client.listNetworks(), message='Network {} deleted successfully.'.format(name))
+    return response.replySuccess(client.listNetworks(), message='Network {} deleted successfully.'.format(name))

app/api/controllers/profile.py

@@ -1,6 +1,6 @@
 from flask import Blueprint, request
 from flask import jsonify
-from flask_jwt import jwt_required
+from flask_jwt_extended import jwt_required
 
 from app.api.models.LXDModule import LXDModule
 from app.api.models.LXCProfile import LXCProfile

app/api/controllers/snapshot.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, request
-from flask_jwt import jwt_required
+from flask_jwt_extended import jwt_required
 from app.api.schemas.container_schema import doValidateCloneMove
 
 from app.api.models.LXCSnapshot import LXCSnapshot

app/api/controllers/storagePool.py

@@ -1,6 +1,5 @@
 from flask import Blueprint, request
-from flask import jsonify
-from flask_jwt import jwt_required
+from flask_jwt_extended import jwt_required
 
 from app.api.models.LXDModule import LXDModule
 from app.api.models.LXCStoragePool import LXCStoragePool