Major major update of UI and dependent features

* Introduced administration features
* Added scss assets for css management using sass
* Improved wares and users management
* Updated tests

Author: fabrejc

README.md

@@ -106,7 +106,7 @@ FLUIDHUB_DATAPATH=./_dev/server/data docker-compose -f docker/docker-compose.yml
 ## Run tests
 
 
-Run the [nosetests](http://nose.readthedocs.io) tool from the root of the source tree, using the `dev-runtests wrapper` script:
+Run the [nosetests](http://nose.readthedocs.io) tool from the root of the source tree, using the `dev-runtests` wrapper script:
 ```
 ./dev-runtests nosetests
 ```

dev-buildtests

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-CWDIR="$(dirname "$(readlink -f "$0")")"
+CWDIR=$(cd "$(dirname "$0")"; pwd)
 
 FLUIDHUB_DATAPATH=${CWDIR}/_dev/server/data docker-compose \
 -f docker/docker-compose.yml \

dev-runtests

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-CWDIR="$(dirname "$(readlink -f "$0")")"
+CWDIR=$(cd "$(dirname "$0")"; pwd)
 
 FLUIDHUB_DATAPATH=${CWDIR}/_dev/server/data docker-compose \
 -f docker/docker-compose.yml \

dev-server

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-CWDIR="$(dirname "$(readlink -f "$0")")"
+CWDIR=$(cd "$(dirname "$0")"; pwd)
 
 FLUIDHUB_DATAPATH=${CWDIR}/_dev/server/data docker-compose \
 -f docker/docker-compose.yml \

fluidhub/FluidHub/GitInfosReader.py

@@ -6,7 +6,7 @@
 import os
 
 from FluidHub.WaresOperations import WaresOperations
-from FluidHub.ConfigManager import ConfigMan  #TODO is this necessary?
+from FluidHub.ConfigManager import ConfigMan  #REVIEW is this necessary?
 
 
 ################################################################################

fluidhub/FluidHub/Tools.py

@@ -5,6 +5,7 @@
 
 import os
 import errno
+import re
 
 
 ################################################################################
@@ -31,3 +32,45 @@ def noneToEmptyString(Data):
       Ret[Key] = ""
 
   return Ret
+
+
+################################################################################
+
+
+def isValidUsername(Username) :
+  return re.match("^[a-z][a-z0-9]*$", Username)
+
+
+################################################################################
+
+
+def isValidEmail(Email) :
+  return re.match("^[\w.\-_]*\@\w[\w.\-_]*$", Email)
+
+
+################################################################################
+
+
+def isValidEmail(Email) :
+  return re.match("^[\w.\-_]*\@\w[\w.\-_]*$", Email)
+
+
+################################################################################
+
+
+def getAsValidList(Str,ValidFunc,WildcardOK=False,Sep=","):
+  Lst = Str.split(Sep)
+  ValidLst = list()
+
+  for Item in Lst:
+    Item = Item.strip(" ")
+
+    if (WildcardOK and Item == "*") :
+      ValidLst.append(Item)
+    elif Item:
+      if ValidFunc(Item):
+        ValidLst.append(Item)
+      else:
+        return None
+
+  return ValidLst

fluidhub/FluidHub/UsersManager.py

@@ -5,7 +5,6 @@
 
 from sqlalchemy import create_engine, MetaData, Table
 import bcrypt
-import re
 
 from FluidHub import Tools
 
@@ -82,8 +81,8 @@ def getUser(self,Username) :
 
   def createUser(self, Username, Definition) :
     # check valid chars for username (A-Z,a-z,0-9,.,_, must start with an alphabetic char)
-    if not re.match("^[a-z][a-z0-9_-]*$", Username):
-      return 400,"invalid username"
+    if not Tools.isValidUsername(Username):
+      return 400,"invalid username format"
 
     # check if provided json data is correct
     if not all(name in Definition for name in ("username","password")) :
@@ -94,6 +93,8 @@ def createUser(self, Username, Definition) :
 
     if "email" not in Definition.keys() :
       Definition["email"] = ""
+    elif not Tools.isValidEmail(Definition["email"]):
+      return 400,"invalid email format"
 
     if "fullname" not in Definition.keys() :
       Definition["fullname"] = ""
@@ -120,8 +121,14 @@ def createUser(self, Username, Definition) :
 
 
   def updateUser(self, Username, Definition) :
-    # TODO
-    return 501,""
+
+    if "fullname" in Definition:
+      self.Users.update().where(self.Users.c.username == Username).values(fullname=Definition["fullname"]).execute()
+
+    if "email" in Definition:
+      self.Users.update().where(self.Users.c.username == Username).values(email=Definition["email"]).execute()
+
+    return 200,""
 
 
 ################################################################################
@@ -144,9 +151,23 @@ def deleteUser(self, Username) :
 ################################################################################
 
 
-  def changePassword(self, Username, OldPassword, NewPassword) :
-    # TODO
-    return False
+  def changePassword(self, Username, NewPassword) :
+
+    Salt = bcrypt.gensalt()
+    HashedPassword = bcrypt.hashpw(NewPassword.encode('utf8'), Salt)
+
+    self.Users.update().where(self.Users.c.username == Username).values(password=HashedPassword).execute()
+
+    return 200,""
+
+
+################################################################################
+
+
+  @staticmethod
+  def isAdmin(Username) :
+    return Username == "admin"
+
 
 
 ################################################################################

fluidhub/FluidHub/WaresOperations.py

@@ -180,18 +180,29 @@ def createWare(self,Type,ID,Definition) :
 
   def updateWare(self,Type,ID,Definition) :
 
-    # TODO implement updating ware
-
     WareGitPath = self.getWareGitReposPath(Type,ID)
     WareDefPath = self.getWaresDefsPath(Type)
     WareDefFile = self.getWareDefFilePath(Type,ID)
 
     if not os.path.exists(WareGitPath) or not os.path.isfile(WareDefFile) :
       return 404,"does not exists"
 
-    return 501,"not implemented"
+    with open(WareDefFile, 'r') as DefFileR:
+      Data = json.load(DefFileR)
+      DefFileR.close()
 
-    return 200,""
+      DefKeys = Definition.keys()
+      for Key in ["shortdesc","users-ro","users-rw","mailinglist"] :
+        if Key in DefKeys:
+          Data[Key] = Definition[Key]
+
+      # writing the updated definition
+      with open(WareDefFile, 'w') as DefFileW:
+        json.dump(Data, DefFileW, indent=2)
+
+      return 200,""
+
+    return 500,"error in existing definition file"
 
 
 ################################################################################

fluidhub/app/api/users.py

@@ -3,7 +3,7 @@
 __author__ = "Jean-Christophe Fabre <jean-christophe.fabre@inra.fr>"
 
 
-from flask import Blueprint,jsonify,request,g
+from flask import Blueprint,jsonify,request,g,abort
 
 from FluidHub import Constants
 from FluidHub.UsersManager import UsersMan
@@ -49,7 +49,7 @@ def GetUser(username) :
 @tokenAuth.login_required
 def CreateUser(username) :
 
-  if g.username != "admin":
+  if not UsersMan.isAdmin(g.username):
     abort(403)
 
   Data = request.get_json(silent=True)
@@ -66,7 +66,7 @@ def CreateUser(username) :
 @tokenAuth.login_required
 def UpdateUser(username) :
 
-  if g.username != "admin":
+  if not UsersMan.isAdmin(g.username):
     abort(403)
 
   abort(501)
@@ -79,7 +79,7 @@ def UpdateUser(username) :
 @tokenAuth.login_required
 def DeleteUser(username) :
 
-  if g.username != "admin":
+  if not UsersMan.isAdmin(g.username):
     abort(403)
 
   Code,Res = UsersMan.deleteUser(username)

fluidhub/app/api/wares.py

@@ -3,11 +3,12 @@
 __author__ = "Jean-Christophe Fabre <jean-christophe.fabre@inra.fr>"
 
 
-from flask import Blueprint,jsonify,request,g
+from flask import Blueprint,jsonify,request,g,abort
 
 from FluidHub import Constants
 from FluidHub.WaresOperations import WaresOperations
 from FluidHub.RoutesAuth import tokenAuth
+from FluidHub.UsersManager import UsersManager
 
 
 ################################################################################
@@ -66,15 +67,15 @@ def GetWare(ware_type,ware_id) :
 @tokenAuth.login_required
 def CreateWare(ware_type,ware_id) :
 
-  if g.username != "admin":
+  if not UsersManager.isAdmin(g.username):
     abort(403)
 
   if ware_type not in Constants.WareTypes :
     return "invalid ware type",404
 
   WaresOps = WaresOperations()
 
-  # TODO is method check necessary
+  # REVIEW is method check necessary
   if request.method == 'PUT' :
     Code,Data = WaresOps.createWare(ware_type,ware_id,request.get_json(silent=True))
     return Data,Code
@@ -87,15 +88,15 @@ def CreateWare(ware_type,ware_id) :
 @tokenAuth.login_required
 def UpdateWare(ware_type,ware_id) :
 
-  if g.username != "admin":
+  if not UsersManager.isAdmin(g.username):
     abort(403)
 
   if ware_type not in Constants.WareTypes :
     return "invalid ware type",404
 
   WaresOps = WaresOperations()
 
-  # TODO is method check necessary
+  # REVIEW is method check necessary
   if request.method == 'PATCH' :
     Code,Data = WaresOps.updateWare(ware_type,ware_id,request.get_json(silent=True))
     return Data,Code
@@ -108,15 +109,15 @@ def UpdateWare(ware_type,ware_id) :
 @tokenAuth.login_required
 def DeleteWare(ware_type,ware_id) :
 
-  if g.username != "admin":
+  if not UsersManager.isAdmin(g.username):
     abort(403)
 
   if ware_type not in Constants.WareTypes :
     return "invalid ware type",404
 
   WaresOps = WaresOperations()
 
-  # TODO is method check necessary
+  # REVIEW is method check necessary
   if request.method == 'DELETE' :
     Code,Data = WaresOps.deleteWare(ware_type,ware_id)
     return Data,Code

fluidhub/app/main.py

@@ -40,7 +40,7 @@
 
 @app.route("/")
 def Root():
-  return redirect(url_for('ui.Root'))
+  return redirect(url_for('ui.Home'))