Fixed Docker + added debug option to Flask

.travis.yml

@@ -30,7 +30,7 @@ install:
 before_script:
   - cd ../
   - export PYTHONWARNINGS="ignore" 
-  - export FLASK_DEBUG=True
+  - export FLASK_DEBUG=1
   - export FLASK_APP=skf/app.py 
   - export PYTHONPATH=.:$PYTHONPATH
 

Angular/src/app/project-list/project-list.component.ts

@@ -44,6 +44,6 @@ export class ProjectListComponent implements OnInit {
   }
 
   open(content) {
-    this.modalService.open(content).result
+    this.modalService.open(content, { size: 'lg' }).result
   }
 }

Angular/src/app/project-summary-audit/project-summary-audit.component.ts

@@ -27,6 +27,7 @@ export class ProjectSummaryAuditComponent implements OnInit {
   public error: string;
   public succes: string;
   public selector: string = "Development";
+  public showMe: string;
 
   ngOnInit() {
     this.route.params.subscribe(params => {
@@ -64,6 +65,7 @@ export class ProjectSummaryAuditComponent implements OnInit {
     this.error = "";
     this.succes = "";
     this.comment = "";
+    this.showMe = checklistId;
     this.route.params.subscribe(params => {
       this.commentService.getComment(checklistId, params['id']).subscribe(
         (data) => {

Docker/alpine/entrypoint.sh

@@ -3,6 +3,8 @@
 set -x 
 
 HTTPS=${HTTPS:-'true'}
+JWT_SECRET=${JWT_SECRET:-''}
+ORIGIN=${ORIGIN:-'localhost'}
 
 # Creation of certificates
 if [[ "$HTTPS" == "true" ]]; then
@@ -28,6 +30,20 @@ else
     PORT=80
 fi
 
+if [[ "$JWT_SECRET" != "" ]]; then
+    perl -pi -e "s/JWT_SECRET = ''/JWT_SECRET = '$JWT_SECRET'/" /skf-flask/skf/settings.py
+else
+    echo 'You need to select a JWT_SECRET'
+    exit
+fi
+
+if [[ "$ORIGIN" != "" ]]; then
+    perl -pi -e "s/\*/https:\/\/$ORIGIN/" /skf-flask/skf/settings.py
+else
+    echo 'You need to select a ORIGIN location'
+    exit
+fi
+
 # Create Nginx dir
 mkdir /run/nginx
 

Docker/alpine/skf-api.sh

@@ -4,4 +4,5 @@
 cd /skf-flask 
 export FLASK_APP=skf/app.py
 export PYTHONPATH=/skf-flask
+export FLASK_DEBUG=True
 python3.6 skf/app.py 

development

@@ -2,13 +2,14 @@
 
 export FLASK_APP=skf/app.py
 export PYTHONPATH=.:$PYTHONPATH
+export FLASK_DEBUG=1
 
 while :
 do
 	case "$(ps x |grep -v grep |grep -c "Python skf")" in
 
 	0)  echo "Restarting skf:"
-	    python3.6 skf/app.py
+	    python3.6 skf/app.py 
 	    ;;
 	2)  echo "SKF already running"
 	    ;;

skf/api/security.py

@@ -60,10 +60,10 @@ def val_alpha_num(value):
 
 
 def val_alpha_num_special(value):
-    """User input validation for checking a-z A-Z 0-9 _ . - ' " """
-    match = re.findall(r"[^ a-zA-Z0-9_.-.'.\"]", value)
+    """User input validation for checking a-z A-Z 0-9 _ . - ' , " """
+    match = re.findall(r"[^ a-zA-Z0-9_.-.'.\".,]", value)
     if match:
-        log("User supplied not an a-z A-Z 0-9 _ . - ' \" value", "MEDIUM", "FAIL")
+        log("User supplied not an a-z A-Z 0-9 _ . - ' \" , value", "MEDIUM", "FAIL")
         abort(400, "Validation Error")
     else:
         return True

skf/app.py

@@ -66,7 +66,7 @@
 
 app = Flask(__name__)
 # TO DO FIX WILDCARD ONLY ALLOW NOW FOR DEV
-cors = CORS(app, resources={r"/*": {"origins": "*"}})
+cors = CORS(app, resources={r"/*": {"origins": settings.ORIGINS}})
 logging.config.fileConfig('logging.conf')
 log = logging.getLogger(__name__)
 
@@ -82,8 +82,8 @@ def configure_app(flask_app):
     flask_app.config['RESTPLUS_MASK_SWAGGER'] = settings.RESTPLUS_MASK_SWAGGER
     flask_app.config['ERROR_404_HELP'] = settings.RESTPLUS_ERROR_404_HELP
     flask_app.config['TESTING'] = settings.TESTING
-    flask_app.config['DEBUG'] = settings.FLASK_DEBUG
-    
+    flask_app.config['FLASK_DEBUG'] = settings.FLASK_DEBUG
+
 
 def initialize_app(flask_app):
     """Initialize the SKF app."""
@@ -121,11 +121,11 @@ def main():
             log.info('>>>>> Configure the JWT_SECRET in the settings.py file and choose an unique 128 character long secret <<<<<')
         else:
             log.info('>>>>> Starting development server http://'+settings.FLASK_HOST+":"+str(settings.FLASK_PORT)+' <<<<<')
-            app.run(host=settings.FLASK_HOST, port=settings.FLASK_PORT, debug=settings.FLASK_DEBUG)
+            app.run(host=settings.FLASK_HOST, port=settings.FLASK_PORT, debug=app.debug)
     if app.debug == True:
         if  settings.JWT_SECRET == '':
             log.info('>>>>> Starting development server http://'+settings.FLASK_HOST+":"+str(settings.FLASK_PORT)+' <<<<<')
-            app.run(host=settings.FLASK_HOST, port=settings.FLASK_PORT, debug=settings.FLASK_DEBUG)        
+            app.run(host=settings.FLASK_HOST, port=settings.FLASK_PORT, debug=app.debug)        
 
 
 if __name__ == "__main__":

skf/settings.py

@@ -18,6 +18,7 @@
 
 # JWT settings
 JWT_SECRET = ''
+ORIGINS = '*'
 
 # TESTING settings
 TESTING = False