@fixed

app.py

@@ -20,6 +20,12 @@ logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
 logging.basicConfig(format='%(asctime)s %(message)s')
 logging.getLogger().addHandler(logging.StreamHandler(sys.stdout))
 
+
+
+def sudoCmd(cmd):
+    cmd.replace("'","\'")
+    return 'sudo sh -c \'' + cmd + '\''
+
 """
  print and save content
  @param string
@@ -110,10 +116,11 @@ mvPath = '/bin/mv '
 cpPath = '/bin/cp '
 rmPath = '/bin/rm  '
 nbgraderPath = '/usr/local/bin/nbgrader '
-nbextensionPath = '/usr/local/bin/nbextension '
+nbextensionPath = 'nbextension'
 usermodPath = '/usr/sbin/usermod '
 chmodPath = '/bin/chmod '
 grepPath = '/bin/grep '
+mkdirPath = '/bin/mkdir '
 
 # début configuration --
 """
@@ -194,13 +201,20 @@ api = Api(app)
     app.run(debug=debugMode,host=host,port=port)
 '''
 
-currentUserName = ''
+ # initialise l'utilisateur qui execute le script
+currentUserName = os.popen('echo "$USER"').read().rstrip()
+
+def changeFolderRightForGroup(jupyterUsername):
+    return sudoPath + ' ' + usermodPath + ' -a -G ' + jupyterUsername + ' ' + currentUserName
+
+def addCurrentUserToJupyterUserGroup(jupyterUsername):
+    return sudoPath + ' ' + chmodPath + ' 770 ' + buildPath(['home',jupyterUsername])
+
+
+
 def onRunCallback():
     dump('onRunCallback')
 
-     # initialise l'utilisateur qui execute le script
-    currentUserName = os.popen('echo "$USER"').read().rstrip()
-
     # patchs
     # controler les groupes utilisateurs
     jupyterUsers = os.popen(grepPath + '"^jupyter\-" /etc/group').read().split('\n')
@@ -228,11 +242,6 @@ def onRunCallback():
 
 onRunCallback()
 
-def changeFolderRightForGroup(jupyterUsername):
-    return sudoPath + ' ' + usermodPath + ' -a -G ' + jupyterUsername + ' ' + currentUserName
-
-def addCurrentUserToJupyterUserGroup(jupyterUsername):
-    return sudoPath + ' ' + chmodPath + ' 770 ' + buildPath(['home',jupyterUsername])
 
 """
 execute une commande sous l'identite de l'utilisateur donne
@@ -413,10 +422,9 @@ def write(username,path,content):
     f.write(content)
     f.close()
 
-    myCmd = sudoPath + mvPath + ' \'' + tempPath + '\' \'' + path + '\''
-    myCmd += ' && ' + chownPath + ' ' + username + ':' + username + ' \'' + path + '\''
+    myCmd = sudoPath + ' ' + mvPath + ' \'' + tempPath + '\' \'' + path + '\''
+    myCmd += ' && ' + sudoPath + ' ' + chownPath + ' ' + username + ':' + username + ' \'' + path + '\''
 
-    myCmd = sudo(myCmd)
     dump(myCmd)
     os.system(myCmd)
 
@@ -584,14 +592,14 @@ def initUserSpace(jupyterUsername,folder,notebookname,fromurl = None,content = '
 
         # dossier ./source
         # débloquage de l'origine
-        copyCmd = ' ' + chattrPath + ' -i \'' +  buildPath(['home',fromJupyterUuid,'source']) + '\''
-        copyCmd += ' && ' + chattrPath + ' -i \'' +  buildPath(['home',jupyterUsername,'source']) + '\''
+        copyCmd = sudoPath + ' ' + chattrPath + ' -i \'' +  buildPath(['home',fromJupyterUuid,'source']) + '\''
+        copyCmd += ' && ' + sudoPath + ' ' + chattrPath + ' -i \'' +  buildPath(['home',jupyterUsername,'source']) + '\''
         # déplace le dossier
-        copyCmd += ' && ' + mvPath + ' \'' + buildPath(['home',fromJupyterUuid,'source',fromFolder]) + '\' \'' + buildPath(['home',jupyterUsername,'source',folder]) + '\''
+        copyCmd += ' && ' + sudoPath + ' ' + mvPath + ' \'' + buildPath(['home',fromJupyterUuid,'source',fromFolder]) + '\' \'' + buildPath(['home',jupyterUsername,'source',folder]) + '\''
         # corrige les droits
         copyCmd += ' && ' + chownPath + ' -R ' + jupyterUsername + ' \'' + buildPath(['home',fromJupyterUuid,'source',folder]) + '\''
-        copyCmd += ' && ' + chattrPath + ' +i \'' +  buildPath(['home',fromJupyterUuid,'source']) + '\''
-        copyCmd += ' && ' + chattrPath + ' +i \'' +  buildPath(['home',jupyterUsername,'source']) + '\''
+        copyCmd += ' && ' + sudoPath + ' ' + chattrPath + ' +i \'' +  buildPath(['home',fromJupyterUuid,'source']) + '\''
+        copyCmd += ' && ' + sudoPath + ' ' + chattrPath + ' +i \'' +  buildPath(['home',jupyterUsername,'source']) + '\''
         dump(copyCmd)
         os.system(copyCmd)
 
@@ -599,7 +607,7 @@ def initUserSpace(jupyterUsername,folder,notebookname,fromurl = None,content = '
         dump( buildPath(['home',jupyterUsername,'source',folder]) )
         
         # déplace le fichier du notebook s'il existe
-        moveCmd = mvPath + ' \'' + buildPath(['home',jupyterUsername,'source',folder,fromNotebookName]) + '\' \'' + buildPath(['home',jupyterUsername,'source',folder,notebookname]) + '\''
+        moveCmd = sudoPath + ' ' + mvPath + ' \'' + buildPath(['home',jupyterUsername,'source',folder,fromNotebookName]) + '\' \'' + buildPath(['home',jupyterUsername,'source',folder,notebookname]) + '\''
         dump(moveCmd)
         os.system(moveCmd)
 
@@ -608,17 +616,20 @@ def initUserSpace(jupyterUsername,folder,notebookname,fromurl = None,content = '
         # creation des dossiers
 
         # dossier ./source
-        myCmd +=  sudoPath + ' -u ' + jupyterUsername + ' mkdir -p \'' + buildPath(['home',jupyterUsername,'source']) + '\''
+        myCmd =  sudoPath + ' -u ' + jupyterUsername + ' ' + mkdirPath + ' -p \'' + buildPath(['home',jupyterUsername,'source']) + '\''
+        dump(myCmd) 
+        dump(os.system(myCmd))
+        
         # débloquage de source
-        myCmd += ' && ' + chattrPath + ' -i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
+        myCmd = sudoPath + ' ' + chattrPath + ' -i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
         # dossier ./[folder]
-        myCmd += ' && ' + sudoPath + ' -u ' + jupyterUsername + ' mkdir \'' + buildPath(['home',jupyterUsername,'source',folder]) + '\''
+        myCmd += ' && ' + sudoPath + ' -u ' + jupyterUsername + ' ' + mkdirPath + ' \'' + buildPath(['home',jupyterUsername,'source',folder]) + '\''
         # bloquage du source
-        myCmd += ' && ' + chattrPath + ' +i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
+        myCmd += ' && ' + sudoPath + ' ' + ' ' + chattrPath + ' +i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
 
-        myCmd = sudo(myCmd)
         dump(myCmd)   
-        os.system(myCmd)
+        dump(os.popen(myCmd).read())
+        #os.system(myCmd)
 
     if content != '': 
         write(jupyterUsername,buildPath(['home',jupyterUsername,'source',folder,notebookname]),content)
@@ -654,12 +665,6 @@ def createUserIfNotExists(token,username):
             URL = serverUrl + buildPath(['users',username,'tokens'])
             result = doPost(token,URL,200)
 
-            # ajout l'utilisateur courant au groupe du nouvel utiliosateur
-            # + change les droits du groupe sur le dossier de l'utilisateur
-            jupyterUsername = getJupyterName(username)
-            os.system(changeFolderRightForGroup(jupyterUsername))
-            os.system(addCurrentUserToJupyterUserGroup(jupyterUsername))
-
             return { 'result' : True,'token' : result['token'],'tokenId':result['id']}
         else:
             return { 'result' : False }
@@ -717,30 +722,49 @@ def createTrainerServer(username,folder,notebookname):
 
 # cas d'une creation de compte utilisateur, il faut le configurer
     if 'token' in result['resultUser'] and ((not 'status' in result['result']) or (result['result']['status'] != '400')):
+        # ajout l'utilisateur courant au groupe du nouvel utiliosateur
+        # + change les droits du groupe sur le dossier de l'utilisateur
+        jupyterUsername = getJupyterName(username)
+        cmd = changeFolderRightForGroup(jupyterUsername)
+        dump(cmd)
+        os.system(cmd)
+
+        cmd = addCurrentUserToJupyterUserGroup(jupyterUsername)
+        dump(cmd)
+        os.system(cmd)
+
         # configuration des extensions de l'utilisateur
         # config formateur de nbgrader
         myCmd = goToUser(jupyterUsername)
-        myCmd += ' && ' + nbextensionPath + ' install --user --py nbgrader'
-        myCmd += ' && ' + nbextensionPath + ' disable --user --py nbgrader'
-        myCmd += ' && ' + nbextensionPath + ' enable --user create_assignment/main'
-        myCmd += ' && ' + nbextensionPath + ' enable --user validate_assignment/main'
+        myCmd += ' && ' + jupyterPath + ' ' + nbextensionPath + ' install --user --py nbgrader'
+        myCmd += ' && ' +  jupyterPath + ' ' + nbextensionPath + ' disable --user --py nbgrader'
+        myCmd += ' && ' +  jupyterPath + ' ' + nbextensionPath + ' enable --user create_assignment/main'
+        myCmd += ' && ' +  jupyterPath + ' ' + nbextensionPath + ' enable --user validate_assignment/main'
         
-        myCmd = runAsUser(jupyterUsername,myCmd)
+        myCmd = sudoCmd(myCmd)
         dump(myCmd)
         os.system(myCmd)
 
         # config du notebook jupyter => changement de la racine d'exploration
-        myCmd += 'echo "c.FileContentsManager.root_dir=\'' + buildPath(['home',jupyterUsername,'source']) + '\'" >> ' + buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
-        myCmd += ' && echo "c.NotebookApp.notebook_dir=\'' + buildPath(['home',jupyterUsername,'source']) + '\'" >> ' + buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
-        
-         # ajoute la configuration de jupyter => timeout de deconnexion
-        myCmd += ' && echo "c.MappingKernelManager.cull_idle_timeout = ' + timeout + '" >> ' + buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
-        myCmd += ' && echo "c.MappingKernelManager.shutdown_no_activity_timeout = ' + timeout + '" >> ' + buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
-        
-        myCmd = sudo(myCmd)
-        dump(myCmd)
+        myCmd = sudoPath + ' ' + mkdirPath + ' -p ' + buildPath(['home',jupyterUsername,'.jupyter'])
+        myCmd += ' && ' + sudoPath + ' ' + chownPath + ' ' + jupyterUsername + ' ' + buildPath(['home',jupyterUsername,'.jupyter'])
+        myCmd += ' && ' + sudoPath + ' ' + chmodPath + ' 770 ' + ' ' + buildPath(['home',jupyterUsername,'.jupyter'])
+        os.system(myCmd)
+
+        #myCmd += ' && ' + sudoPath + ' -u ' + currentUserName + ' ' + chmodPath + ' 770 ' + buildPath(['home',jupyterUsername,'.jupyter'])
+        configContent = 'c.FileContentsManager.root_dir=\'' + buildPath(['home',jupyterUsername,'source']) + '\'' + "\n"
+        configContent += 'c.NotebookApp.notebook_dir=\'' + buildPath(['home',jupyterUsername,'source']) + '\'' + "\n"
+        configContent += 'c.MappingKernelManager.cull_idle_timeout = ' + timeout + "\n"
+        configContent += 'c.MappingKernelManager.shutdown_no_activity_timeout = ' + timeout + "\n"
+        write(jupyterUsername,buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py']),configContent)
+
+        # vérouille les configurations
+        myCmd = 'chattr +i ' +  buildPath(['home',jupyterUsername,'.jupyter'])
+        myCmd += ' && chattr +i ' +  buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
         os.system(myCmd)
 
+        #dump(os.popen(myCmd).read())
+
         # ajoute la configuration de jupyter
         #configContent = "c.FileContentsManager.root_dir='" + buildPath(['home',jupyterUsername,'source']) + "'\n"
         #configContent += "c.NotebookApp.notebook_dir ='c.FileContentsManager.root_dir='" + buildPath(['home',jupyterUsername,'source']) + "'"
@@ -766,7 +790,7 @@ def createTrainerServer(username,folder,notebookname):
     return json.dumps(reponse),200
 
 """
-url: [host]/student/<username>/<fodler>/<notebookName>
+url: [host]/student/<username>/<folder>/<notebookName>
 """
 @app.route(buildRoutePath(['student','<trainername>','<username>','<folder>','<notebookname>']),methods=['POST'])
 def createStudentServer(trainername,username,folder,notebookname):
@@ -793,28 +817,42 @@ def createStudentServer(trainername,username,folder,notebookname):
 #
 # cas d'une creation de compte utilisateur, il faut le configurer en tant que formateur
     if 'token' in result['resultUser'] and ((not 'status' in result['result']) or (result['result']['status'] != '400')):
+        # ajout l'utilisateur courant au groupe du nouvel utiliosateur
+        # + change les droits du groupe sur le dossier de l'utilisateur
+        jupyterUsername = getJupyterName(username)
+        cmd = changeFolderRightForGroup(jupyterUsername)
+        dump(cmd)
+        os.system(cmd)
+
+        cmd = addCurrentUserToJupyterUserGroup(jupyterUsername)
+        dump(cmd)
+        os.system(cmd)
+
         # configuration des extensions de l'utilisateur
         # config formateur de nbgrader
         myCmd = goToUser(jupyterUsername)
-
-        # personalise les extensions
         myCmd += ' && ' + nbextensionPath + ' install --user --py nbgrader'
         myCmd += ' && ' + nbextensionPath + ' disable --user --py nbgrader'
-        #myCmd += ' && ' + runAsUser(jupyterUsername) + '\'jupyter nbextension disable --user validate_assignment/main\''
         myCmd = runAsUser(jupyterUsername,myCmd)
         dump(myCmd)
         os.system(myCmd)
 
-        # config du notebook jupyter => changement de la racine d'exploration + configuration nbgrader
-        myCmd = 'echo "c.FileContentsManager.root_dir=\'' + buildPath(['home',jupyterUsername,'source']) + '\'" >> ' + buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
-        myCmd += ' && echo "c.NotebookApp.notebook_dir=\'' + buildPath(['home',jupyterUsername,'source']) + '\'" >> ' + buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
+        # config du notebook jupyter => changement de la racine d'exploration
+        myCmd = sudoPath + ' ' + mkdirPath + ' -p ' + buildPath(['home',jupyterUsername,'.jupyter'])
+        myCmd += ' && ' + sudoPath + ' ' + chownPath + ' ' + jupyterUsername + ' ' + buildPath(['home',jupyterUsername,'.jupyter'])
+        myCmd += ' && ' + sudoPath + ' ' + chmodPath + ' 770 ' + ' ' + buildPath(['home',jupyterUsername,'.jupyter'])
+        os.system(myCmd)
 
-        # ajoute la configuration de jupyter => timeout de deconnexion
-        myCmd += ' && echo "c.MappingKernelManager.cull_idle_timeout = ' + timeout + '" >> ' + buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
-        myCmd += ' && echo "c.MappingKernelManager.shutdown_no_activity_timeout = ' + timeout + '" >> ' + buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
-        
-        myCmd = sudo(myCmd)
-        dump(myCmd)
+        #myCmd += ' && ' + sudoPath + ' -u ' + currentUserName + ' ' + chmodPath + ' 770 ' + buildPath(['home',jupyterUsername,'.jupyter'])
+        configContent = 'c.FileContentsManager.root_dir=\'' + buildPath(['home',jupyterUsername,'source']) + '\'' + "\n"
+        configContent += 'c.NotebookApp.notebook_dir=\'' + buildPath(['home',jupyterUsername,'source']) + '\'' + "\n"
+        configContent += 'c.MappingKernelManager.cull_idle_timeout = ' + timeout + "\n"
+        configContent += 'c.MappingKernelManager.shutdown_no_activity_timeout = ' + timeout + "\n"
+        write(jupyterUsername,buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py']),configContent)
+
+        # vérouille les configurations
+        myCmd = 'chattr +i ' +  buildPath(['home',jupyterUsername,'.jupyter'])
+        myCmd += ' && chattr +i ' +  buildPath(['home',jupyterUsername,'.jupyter','jupyter_notebook_config.py'])
         os.system(myCmd)
 
         #configPath =  '/home/' + jupyterUsername + '}/.jupyter/jupyter_notebook_config.py'
@@ -832,14 +870,14 @@ def createStudentServer(trainername,username,folder,notebookname):
     toPath = buildPath(['home',jupyterUsername,'source'])
     
     # dévérouillage des dossiers
-    copyCmd = ' ' + chattrPath + ' -i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
-    copyCmd += '&& ' + chattrPath + ' -i \'' + buildPath(['home',trainerJupyterUsername,'source']) + '\''
+    copyCmd = ' ' + sudoPath + ' ' + chattrPath + ' -i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
+    copyCmd += '&& ' + sudoPath + ' ' + chattrPath + ' -i \'' + buildPath(['home',trainerJupyterUsername,'source']) + '\''
     # copie
-    copyCmd += '&& ' + cpPath + ' -r \'' + fromPath + '\' \'' + toPath + '\''
-    copyCmd += ' && ' + chownPath + ' -R ' + jupyterUsername + ' \'' + toPath + '\''
+    copyCmd += '&& ' + sudoPath + ' ' + cpPath + ' -r \'' + fromPath + '\' \'' + toPath + '\''
+    copyCmd += ' && ' + sudoPath + ' ' + chownPath + ' -R ' + jupyterUsername + ' \'' + toPath + '\''
     # vérouillage des dossiers
-    copyCmd += ' && ' + chattrPath + ' +i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
-    copyCmd += ' && ' + chattrPath + ' +i \'' + buildPath(['home',trainerJupyterUsername,'source']) + '\''
+    copyCmd += ' && ' + sudoPath + ' ' + chattrPath + ' +i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
+    copyCmd += ' && ' + sudoPath + ' ' + chattrPath + ' +i \'' + buildPath(['home',trainerJupyterUsername,'source']) + '\''
     dump(copyCmd)
     os.system(copyCmd)
 
@@ -940,9 +978,9 @@ def createAssesmentStudentServer(trainername,username,folder,notebookname):
     # débloquage du source
     myCmd = chattrPath + ' -i \'' + buildPath(['home',jupyterUsername,'source']) + '\''
     # dossier ./source
-    myCmd += ' && ' + sudoPath + ' -u ' + jupyterUsername + ' mkdir -p \''+ buildPath(['home',jupyterUsername,'source']) +'\''
+    myCmd += ' && ' + sudoPath + ' -u ' + jupyterUsername + ' ' + mkdirPath + ' -p \''+ buildPath(['home',jupyterUsername,'source']) +'\''
     # dossier ./cours
-    myCmd += ' && ' + sudoPath + ' -u ' + jupyterUsername + ' mkdir \''+ buildPath(['home',jupyterUsername,'source',folder]) + '\''
+    myCmd += ' && ' + sudoPath + ' -u ' + jupyterUsername + ' ' + mkdirPath + ' \''+ buildPath(['home',jupyterUsername,'source',folder]) + '\''
     # bloquage du source
     myCmd += ' && ' + chattrPath + ' +i \''+ buildPath(['home',jupyterUsername,'source']) +'\''
 
@@ -1016,6 +1054,7 @@ def sendStudentNotebook(trainername,username,folder):
     dump(getScoresCommand)
     os.system(getScoresCommand)
 
+
     score = None
     maxScore = None
 
@@ -1074,9 +1113,9 @@ def deleteNotebook(uuid,folder):
     path = buildPath(['home',getJupyterName(uuid),'source',folder])
     dump('|' + path + '|')
     #if os.path.isdir(path) : 
-    removeCmd =  '' + chattrPath + ' -i \'' + pathSource + '\''
-    removeCmd += ' && ' + rmPath + ' -rf \'' + path + '\''
-    removeCmd += ' && ' + chattrPath + ' +i \'' + pathSource + '\''
+    removeCmd =  sudoPath + ' ' + chattrPath + ' -i \'' + pathSource + '\''
+    removeCmd += ' && ' + sudoPath + ' ' + rmPath + ' -rf \'' + path + '\''
+    removeCmd += ' && ' + sudoPath + ' ' + chattrPath + ' +i \'' + pathSource + '\''
     dump(removeCmd)
     os.system(removeCmd)
 
@@ -1111,18 +1150,18 @@ def cloneNotebook(fromuuid,touuid,fromfolder,tofolder,reset):
     dump(pathTo)
 
     # dévérouille les dossiers
-    cloneCommand =  chattrPath + ' -i \'' + pathSourceFrom + '\''
-    cloneCommand +=  ' && ' + chattrPath + ' -i \'' + pathSourceTo + '\''
+    cloneCommand =  sudoPath + ' ' + chattrPath + ' -i \'' + pathSourceFrom + '\''
+    cloneCommand +=  ' && ' + sudoPath + ' ' + chattrPath + ' -i \'' + pathSourceTo + '\''
     if os.path.isdir(pathFrom) : 
         if os.path.isdir(pathTo) and reset == '1' and pathFrom != pathTo: 
             # suppression
-            cloneCommand += ' && ' + rmPath + ' -rf \'' + pathTo + '\''
+            cloneCommand += ' && ' + sudoPath + ' ' + rmPath + ' -rf \'' + pathTo + '\''
         # copie
-        cloneCommand  += ' && ' + cpPath + ' -r \'' + pathFrom + '/\' \'' + pathTo + '/\''
-        cloneCommand  += ' && ' + chownPath + ' -R ' + jupyterUuidTo + ' \'' + pathSourceTo + '\''
+        cloneCommand  += ' && ' + sudoPath + ' ' + cpPath + ' -r \'' + pathFrom + '/\' \'' + pathTo + '/\''
+        cloneCommand  += ' && ' + sudoPath + ' ' + chownPath + ' -R ' + jupyterUuidTo + ' \'' + pathSourceTo + '\''
 
-    cloneCommand +=  ' && ' + chattrPath + ' +i \'' + pathSourceFrom + '\''
-    cloneCommand +=  ' && ' + chattrPath + ' +i \'' + pathSourceTo + '\''
+    cloneCommand +=  ' && ' + sudoPath + ' ' + chattrPath + ' +i \'' + pathSourceFrom + '\''
+    cloneCommand +=  ' && ' + sudoPath + ' ' + chattrPath + ' +i \'' + pathSourceTo + '\''
 
     dump(cloneCommand)
     os.system(cloneCommand)