slaprunner: remove create user at first launch

setup.py

@@ -43,6 +43,7 @@ setup(name=name,
         'slapos.core', # as it provides library for slap
         'xml_marshaller', # needed to dump information
         'GitPython', #needed for git manipulation into slaprunner
+        'passlib',
         'netifaces',
       ] + additional_install_requires,
       extras_require = {

slapos/runner/gittools.py

@@ -11,79 +11,68 @@ from git import Repo
 from flask import jsonify
 
 
-def cloneRepo(data):
+def cloneRepo(url, workDir, user="", email=""):
   """Clone a repository
   Args:
-    data: a dictionary of parameters to use:
-      data['path'] is the path of the new project
-      data['repo'] is the url of the repository to be cloned
-      data['email'] is the user's email
-      data['user'] is the name of the user
-  Returns:
-    a jsonify data"""
-  workDir = data['path']
+    workDir is the path of the new project
+    url is the url of the repository to be cloned
+    email is the user's email
+    user is the name of the user"""
+
   if not workDir:
     return jsonify(code=0,
                    result="Can not create project folder.")
-  code = 0
-  json = ""
-  try:
+
   if os.path.exists(workDir) and len(os.listdir(workDir)) < 2:
     shutil.rmtree(workDir)  # delete useless files
-    repo = Repo.clone_from(data["repo"], workDir)
+  repo = Repo.clone_from(url, workDir)
   config_writer = repo.config_writer()
   config_writer.add_section("user")
-    if data["user"] != "":
-      config_writer.set_value("user", "name", data["user"].encode("utf-8"))
-    if data["email"] != "":
-      config_writer.set_value("user", "email", data["email"])
-    code = 1
-  except Exception as e:
-    json = safeResult(str(e))
-  return jsonify(code=code, result=json)
-
+  if user != "":
+    config_writer.set_value("user", "name", user.encode("utf-8"))
+  if email != "":
+    config_writer.set_value("user", "email", email)
+
+def updateGitConfig(repository, user, email):
+  if not os.path.exists(repository):
+    return
+  repo = Repo(repository)
+  config_writer = repo.config_writer()
+  if user != "":
+    config_writer.set_value("user", "name", user.encode("utf-8"))
+  if email != "":
+    config_writer.set_value("user", "email", email)
+  config_writer.release()
 
 def gitStatus(project):
   """Run git status and return status of specified project folder
   Args:
     project: path of the projet to get status
   Returns:
-    a parsed string that contains the result of git status"""
-  code = 0
-  json = ""
-  try:
+    a list with (result of git status, current branch, isdirty)"""
+
   repo = Repo(project)
   git = repo.git
-    json = git.status().replace('#', '')
+  result = git.status().replace('#', '')
   branch = git.branch().replace(' ', '').split('\n')
   isdirty = repo.is_dirty(untracked_files=True)
-    code = 1
-  except Exception as e:
-    json = safeResult(str(e))
-  return jsonify(code=code, result=json, branch=branch, dirty=isdirty)
+  return (result, branch, isdirty)
 
 
-def switchBranch(project, name):
+def switchBranch(project, branch):
   """Switch a git branch
   Args:
     project: directory of the local git repository
-    name: switch from current branch to `name` branch
-  Returns:
-    a jsonify data"""
-  code = 0
-  json = ""
-  try:
+    name: switch from current branch to `name` branch"""
+
   repo = Repo(project)
   current_branch = repo.active_branch.name
-    if name == current_branch:
-      json = "This is already your active branch for this project"
+  if branch == current_branch:
+    return False
   else:
     git = repo.git
-      git.checkout(name)
-      code = 1
-  except Exception as e:
-    json = safeResult(str(e))
-  return jsonify(code=code, result=json)
+    git.checkout(branch)
+    return True
 
 
 def addBranch(project, name, onlyCheckout=False):
@@ -93,20 +82,17 @@ def addBranch(project, name, onlyCheckout=False):
     name: name of the new branch
     onlyCheckout: if True then the branch `name` is created before checkout
   Returns:
-    a jsonify data"""
-  code = 0
-  json = ""
-  try:
+    True or False"""
+  
+  if not os.path.exists(project):
+    return False
   repo = Repo(project)
   git = repo.git
   if not onlyCheckout:
     git.checkout('-b', name)
   else:
     git.checkout(name)
-    code = 1
-  except Exception as e:
-    json = safeResult(str(e))
-  return jsonify(code=code, result=json)
+  return True
 
 
 def getDiff(project):

slapos/runner/run.py

@@ -8,12 +8,16 @@ import flask
 import logging
 import logging.handlers
 import os
+import urlparse
 from slapos.htpasswd import HtpasswdFile
 from slapos.runner.process import setHandler
 import sys
 from slapos.runner.utils import runInstanceWithLock
 from slapos.runner.views import *
+from slapos.runner.gittools import cloneRepo, switchBranch
+from git import GitCommandError
 import time
+import traceback
 
 TRUE_VALUES = (1, '1', True, 'true', 'True')
 
@@ -129,6 +133,20 @@ def serve(config):
     os.mkdir(software_link)
   setHandler()
   app.logger.addHandler(config.logger)
+  repo_url = app.config['default_repository']
+  branch_name = app.config.get('default_repository_branch', '')
+  repo_name = os.path.basename(repo_url.replace('.git', ''))
+  try:
+    repository_path = os.path.join(workdir, repo_name)
+    app.config.update(default_repository_path=repository_path)
+    if len(os.listdir(workdir)) == 0 or not os.path.exists(repository_path):
+      app.logger.info('cloning repository %s...' % repo_url)
+      result = cloneRepo(repo_url, repository_path)
+      if branch_name:
+        switchBranch(repository_path, branch_name)
+  except GitCommandError, e:
+    app.logger.warning('Error while cloning default repository: %s' % str(e))
+    traceback.print_exc()
   app.logger.info('Running slapgrid...')
   if app.config['auto_deploy_instance'] in TRUE_VALUES:
     import thread

slapos/runner/static/css/styles.css

@@ -707,7 +707,7 @@ a.lshare img{
 }
 .form{padding:10px; padding-left:20px;}
 .form label{display:block; float:left; width:150px; padding-top:10px;}
-.form input[type=text] ,.form input[type=password] {float:left; width:190px;margin:5px;}
+.form input[type=text] ,.form input[type=password], .form select {float:left; width:190px;margin:5px;}
 .hiddendiv {display: none;white-space: pre-wrap;min-height: 18px;font-size: 13px;
   padding:3px;word-wrap: break-word;width:430px; max-height:120px;font-family: 'Helvetica Neue',Tahoma,Helvetica,Arial,sans-serif;}
 .list{display: block;padding: 5px;background: #E7E7E7; margin-bottom:7px;}

slapos/runner/static/js/scripts/account.js

@@ -8,59 +8,56 @@ $(document).ready(function () {
     $("#information").Tooltip();
 
     $("#update").click(function () {
-        var haspwd = false,
-            hasAccount = ($("input#hasAccount").val() !== "");
-        if ($("input#username").val() === "" || !$("input#username").val().match(/^[\w\d\._\-]+$/)) {
+        var haspwd = false;
+        if ($("select#username").val() === "" || !$("select#username").val().match(/^[\w\d\._\-]+$/)) {
             $("#error").Popup("Invalid user name. Please check it!", {type: 'alert', duration: 3000});
             return false;
         }
         if ($("input#name").val() === "") {
-            $("#error").Popup("Please enter your name and surname!", {type: 'alert', duration: 3000});
+            $("#error").Popup("Please enter your full name for git configuration!", {type: 'alert', duration: 3000});
             return false;
         }
         if (!$("input#email").val().match(/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/)) {
             $("#error").Popup("Please enter a valid email address!", {type: 'alert', duration: 3000});
             return false;
         }
-        if (!hasAccount && !$("input#password").val()) {
-            $("#error").Popup("Please enter your new password!", {type: 'alert', duration: 3000});
-            return false;
-        }
         if ($("input#password").val() !== "") {
             if ($("input#password").val() === "" || !$("input#password").val()) {
+                $("#error").Popup("Please enter your current password!", {type: 'alert', duration: 3000});
+                return false;
+            }
+            if ($("input#npassword").val() === "" || !$("input#npassword").val()) {
                 $("#error").Popup("Please enter your new password!", {type: 'alert', duration: 3000});
                 return false;
             }
-            if ($("input#password").val() !== $("input#cpassword").val()) {
-                $("#error").Popup("your password does not match!", {type: 'alert', duration: 3000});
+            if ($("input#npassword").val() !== $("input#cpassword").val()) {
+                $("#error").Popup("your new password does not match!", {type: 'alert', duration: 3000});
                 return false;
             }
             haspwd = true;
         }
-        if (!$("input#rcode").val().match(/^[\w\d]+$/)) {
-            $("#error").Popup("Please enter your password recovery code.", {type: 'alert', duration: 3000});
-            return false;
-        }
         if (send) {
             return false;
         }
         send = true;
-	var base_url = 'https://' + $("input#username").val()  + ':'
-	    + $("input#password").val() + '@' + location.host
         $.ajax({
             type: "POST",
-            url: $SCRIPT_ROOT + ((hasAccount) ? '/updateAccount' : '/configAccount'),
+            url: $SCRIPT_ROOT + '/updateAccount',
             data: {
                 name: $("input#name").val(),
-                username: $("input#username").val(),
+                username: $("select#username").val(),
                 email: $("input#email").val(),
                 password: ((haspwd) ? $("input#password").val() : ""),
-                rcode: $("input#rcode").val()
+                new_password: ((haspwd) ? $("input#npassword").val() : "")
             },
             success: function (data) {
                 if (data.code === 1) {
-                    var url = 'https://' + $("input#username").val() + ':' + $("input#password").val() + '@' + location.host + $SCRIPT_ROOT + '/';
+                    if ($("input#npassword").val() !== "") {
+                        var url = 'https://' + $("select#username").val() + ':' + $("input#npassword").val() + '@' + location.host + $SCRIPT_ROOT + '/';
                         window.location.href = url;
+                    } else {
+                      $("#error").Popup("Account information saved successfully!", {type: 'info', duration: 5000});
+                    }
                 } else {
                     $("#error").Popup(data.result, {type: 'error', duration: 5000});
                 }
@@ -101,10 +98,6 @@ $(document).ready(function () {
             $("#error").Popup("Invalid user name. Please check it!", {type: 'alert', duration: 3000});
             return false;
         }
-        if (!$("input#new_rcode").val().match(/^[\w\d]+$/)) {
-            $("#error").Popup("Please enter your password recovery code.", {type: 'alert', duration: 3000});
-            return false;
-        }
         if (send) {
             return false;
         }
@@ -114,8 +107,7 @@ $(document).ready(function () {
             url: $SCRIPT_ROOT + '/addUser',
             data: {
                 username: $("input#new_username").val(),
-                password: $("input#new_password").val(),
-  		rcode: $("input#new_rcode").val(),
+                password: $("input#new_password").val()
             },
             success: function (data) {
                 if (data.code === 1) {
@@ -128,7 +120,6 @@ $(document).ready(function () {
                 send = false;
                 $("input#new_username").val('');
                 $("input#new_password").val('');
-  		$("input#new_rcode").val('');
             },
             error: function () { send = false; }
         });

slapos/runner/static/js/scripts/cloneRepo.js

@@ -33,7 +33,7 @@ $(document).ready(function () {
           $("#repoEmpty").hide();
           $("#repoContent").show();
           for (i = 0; i < result.length; i += 1) {
-              $("#project").append("<option value='"+result[i]+"'>"+result[i]+"</option>")
+              $("#project").append("<option value='"+result[i]+"'>"+result[i]+"</option>");
           }
           $("#project").change();
         }
@@ -144,11 +144,15 @@ $(document).ready(function () {
                 $("#clone").append("Clone");
                 send = false;
             },
-            error: function (request, error) {
-                $("#error").Popup("unable to clone your project, please check your internet connection", {type: 'error', duration: 3000});
+            error: function (xhr, request, error) {
+              console.log(xhr.responseText);
+                $("#error").Popup("unable to clone your project, please check your internet connection.<br/>" + xhr.responseText, {type: 'error', duration: 5000});
                 $("#imgwaitting").hide();
                 $("#clone").empty();
                 $("#clone").append("Clone");
+            },
+            always: function () {
+              send = false;
             }
         });
         return false;

slapos/runner/static/js/scripts/repo.js

@@ -29,8 +29,8 @@ $(document).ready(function () {
     function gitStatus() {
         var project = $("#project").val(),
             urldata = $("input#workdir").val() + "/" + project;
+
         $("#status").empty();
-	$("#commit").hide();
         $("#flash").empty();
         if (project === "") {
             $("#status").append("<h2>Please select one project...</h2><br/><br/>");
@@ -55,11 +55,11 @@ $(document).ready(function () {
                     //alert(message);
                     $("#status").append("<p>" + message + "</p>");
                     if (data.dirty) {
-                        $("#commit").show();
-                        $("#status").append("<br/><h2>Display Diff for current Project</h2>");
-                        $("#status").append("<p style='font-size:15px;'>You have changes in your project." +
+                        $("#status").append(
+                            "<br/><p style='font-size:15px;color: #D62B2B;padding: 0;'" +
+                            ">You have changes in your project." +
                             " <a href='#' id='viewdiff'"
-                            + ">Watch the diff file</a></p>");
+                            + ">Watch the diff</a></p>");
                     }
                     $("#viewdiff").click(function () {
                       viewDiff();

slapos/runner/templates/account.html

@@ -9,45 +9,69 @@
 {% block body %}
 <div id="tabContainer">
   <ul>
-    <li><a href="#tab1" class="active">Your personal information</a></li>
+    <li><a href="#tab1" class="active">Update Account information</a></li>
     {% if params %}
-    <li><a href="#tab2">Build & Run configuration</a></li>
     <li><a href="#tab3">Add user</a></li>
+    <li><a href="#tab2">Build & Run configuration</a></li>
     {% endif %}
   </ul><!-- //Tab buttons -->
   <div class="tabDetails">
     <div id="tab1" class="tabContents">
       <form class="account">
         <div class='form'>
-          <label for="name">Your name: </label>
-          <input type='text' name='name' id='name' value='{{name}}'/>
-          <div class='clear'></div>
-          <label for="email">Your email address: </label>
-          <input type='text' name='email' id='email' value='{{email}}'/>
-          <div class='clear'></div>
-          <label for="username">User name: </label>
-          <input type='text' name='username' id='username' value='{{username}}'/>
+          <fieldset>
+            <legend><b> User credentials </b> </legend>
+            <label for="username">Username: </label>
+            <select name="username" id="username">
+              {% for username in username_list -%}
+              <option value="{{username}}">{{username}}</option>
+              {% endfor -%}
+            </select>
             <div class='clear'></div>
             <label for="password">Password: </label>
             <input type='password' name='password' id='password' value=''/>
             <div class='clear'></div>
-          <label for="cpassword">Confirm Password: </label>
+            <label for="npassword">New Password: </label>
+            <input type='password' name='npassword' id='npassword' value=''/>
+            <div class='clear'></div>
+            <label for="cpassword">Confirm New Password: </label>
             <input type='password' name='cpassword' id='cpassword' value=''/>
             <div class='clear'></div>
+          </fieldset>
           <br/>
-          <label for="rcode">Password Recovery code:</label>
-          <input type='password' name='rcode' id='rcode' value=''/>
-          <span class="information"><a href="#" id="information" rel="tooltip">help ?</a></span>
+          <fieldset>
+            <legend><b> Git user and email </b> </legend>
+            <label for="name">Your name: </label>
+            <input type='text' name='name' id='name' value='{{name}}'/>
+            <div class='clear'></div>
+            <label for="email">Your email address: </label>
+            <input type='text' name='email' id='email' value='{{email}}'/>
             <div class='clear'></div>
+          </fieldset>
           <br/>
           <label></label>
           <input type="submit" name="update" id ="update" value="Update Account" class="button"/>
           <div class='clear'></div>
         </div>
-        <input type="hidden" name="hasAccount" id="hasAccount" value="{{name}}"/>
       </form>
     </div>
     {% if params %}
+    <div id="tab3" class="tabContents">
+      <form class="slapgrid">
+        <div class='form'>
+          <label for="username">New user name :</label>
+          <input type='text' name='username' id='new_username'/>
+          <div class='clear'></div>
+          <label for="password">New password :</label>
+          <input type='password' name='password' id='new_password'/>
+          <div class='clear'></div>
+          <br/>
+          <label></label>
+          <input type="submit" name="add_user" id="add_user" value="Add new user" class="button"/>
+          <div class='clear'></div>
+        </div>
+      </form>
+    </div>
     <div id="tab2" class="tabContents">
       <form class="slapgrid">
         <div class='form'>
@@ -72,26 +96,6 @@
         </div>
       </form>
     </div>
-    <div id="tab3" class="tabContents">
-      <form class="slapgrid">
-        <div class='form'>
-          <label for="username">New user name :</label>
-          <input type='text' name='username' id='new_username'/>
-          <div class='clear'></div>
-          <label for="password">New password :</label>
-          <input type='password' name='password' id='new_password'/>
-          <div class='clear'></div>
-          <label for="new_rcode">Password Recovery code:</label>
-          <input type='password' name='new_rcode' id='new_rcode' value=''/>
-          <span class="information"><a href="#" id="information" rel="tooltip">help ?</a></span>
-          <div class='clear'></div>
-          <br/>
-          <label></label>
-          <input type="submit" name="add_user" id="add_user" value="Add new user" class="button"/>
-          <div class='clear'></div>
-        </div>
-      </form>
-    </div>
     {% endif %}
 </div>
 </div>

slapos/runner/templates/manageRepository.html

@@ -106,21 +106,8 @@
         	<input type="submit" name="addbranch" id ="addbranch" value="Add" class="button" title='add new branch: git checkout -b branch'/>
         	<input type="submit" name="docheckout" id ="docheckout" value="Checkout" class="button" title='add existing branch: git checkout branch'/>
         	<br/>
-      	<!--<label for='pullbranch'>Update your local repository: </label>-->
-      	<!--<input type="submit" name="pullbranch" id ="pullbranch" value="Pull" class="button"/>-->
-      	<!--<img class="waitting" id="pullimgwaitting" src="{{ url_for('static', filename='images/waiting.gif') }}" alt="" />-->
         	</div>
         	</div>
-      	<div id="commit" style="margin-bottom:20px;">
-      	<h2>Commit All your changes (On active branch)</h2>
-      	<div style="margin-left:15px;">
-      	<label for='commitmsg'>Commit message: </label>
-      	<input type="text" name="commitmsg" id="commitmsg" size='40' value="Enter message..." />
-      	<input type="submit" name="commit" id ="commitbutton" value="Commit" class="button"/>
-      	<img class="waitting" id="imgwaitting" src="{{ url_for('static', filename='images/waiting.gif') }}" alt="" />
-      	</div>
-      	</div>
-      	<br/>
         </div>
       </div>
       </form>

slapos/runner/utils.py

@@ -24,7 +24,8 @@ from flask import jsonify
 from slapos.runner.gittools import cloneRepo
 
 from slapos.runner.process import Popen
-from slapos.htpasswd import HtpasswdFile
+# from slapos.htpasswd import HtpasswdFile
+from passlib.apache import HtpasswdFile
 import slapos.slap
 from slapos.grid.utils import md5digest
 
@@ -60,61 +61,36 @@ def html_escape(text):
   """Produce entities within text."""
   return "".join(html_escape_table.get(c, c) for c in text)
 
-
 def getSession(config):
   """
   Get the session data of current user.
   Returns:
     a list of user information or None if the file does not exist.
   """
-  user_path = os.path.join(config['etc_dir'], '.users')
+  user_path = os.path.join(config['etc_dir'], '.htpasswd')
   if os.path.exists(user_path):
     return open(user_path).read().split(';')
 
+def checkUserCredential(config, username, password):
+  htpasswdfile = os.path.join(config['etc_dir'], '.htpasswd')
+  if not os.path.exists(htpasswdfile):
+    return False
+  passwd = HtpasswdFile(htpasswdfile)
+  return passwd.check_password(username, password)
 
-def saveSession(config, account):
+def updateUserCredential(config, username, password):
   """
   Save account information for the current user
 
-  Args:
-    config: Slaprunner configuration
-    session: Flask session
-    account: New session data to be save
-
-  Returns:
-    True if all goes well or str (error message) if fail
   """
-  # XXX Cedric LN hardcoded path for files
-  user = os.path.join(config['etc_dir'], '.users')
+  if username and password:
     htpasswdfile = os.path.join(config['etc_dir'], '.htpasswd')
-  backup = False
-  try:
-    if os.path.exists(user):
-      #backup previous data
-      data = open(user).read()
-      open('%s.back' % user, 'w').write(data)
-      backup = True
-      if not account[1]:
-        account[1] = data.split(';')[1]
-    #save new account data
-    open(user, 'w').write((';'.join(account)).encode("utf-8"))
-    # Htpasswd file for cloud9
-    # XXX Cedric Le N order of account list values suppose to be fixed
-    # Remove former file to avoid outdated accounts
-    if os.path.exists(htpasswdfile):
-      os.remove(htpasswdfile)
-    passwd = HtpasswdFile(htpasswdfile, create=True)
-    passwd.update(account[0], account[1])
+    passwd = HtpasswdFile(htpasswdfile)
+    passwd.set_password(username, password)
     passwd.save()
     return True
-  except Exception as e:
-    try:
-      if backup:
-        os.remove(user)
-        os.rename('%s.back' % user, user)
-    except:
-      pass
-    return str(e)
+
+  return False
 
 
 def getRcode(config):
@@ -125,17 +101,23 @@ def getRcode(config):
   except (ConfigParser.NoSectionError, IOError) as e:
     return None
 
+def getUsernameList(config):
+  htpasswdfile = os.path.join(config['etc_dir'], '.htpasswd')
+  if os.path.exists(htpasswdfile):
+    passwd = HtpasswdFile(htpasswdfile)
+    return passwd.users()
+
+  return []
 
 def createNewUser(config, name, passwd):
   htpasswdfile = os.path.join(config['etc_dir'], '.htpasswd')
   if os.path.exists(htpasswdfile):
     htpasswd = HtpasswdFile(htpasswdfile)
-    htpasswd.update(name, passwd)
+    htpasswd.set_password(name, passwd)
     htpasswd.save()
     return True
   return False
 
-
 def getCurrentSoftwareReleaseProfile(config):
   """
   Returns used Software Release profile as a string.

slapos/runner/views.py

@@ -15,27 +15,29 @@ from flask import (Flask, request, redirect, url_for, render_template,
                    g, flash, jsonify, session, abort, send_file)
 
 import slapos
-from slapos.runner.utils import (checkSoftwareFolder, configNewSR,
+from slapos.runner.utils import (checkSoftwareFolder, configNewSR, checkUserCredential,
                                  createNewUser, getBuildAndRunParams,
                                  getProfilePath, getSlapgridResult,
                                  listFolder, getBuildAndRunParams,
-                                 getProjectTitle, getRcode, getSession,
+                                 getProjectTitle, getRcode, updateUserCredential,
                                  getSlapStatus, getSvcStatus,
-                                 getSvcTailProcess, isInstanceRunning,
+                                 getSvcTailProcess, getUsernameList, isInstanceRunning,
                                  isSoftwareRunning, isSoftwareReleaseReady, isText,
                                  loadSoftwareRList, md5sum, newSoftware,
                                  readFileFrom, readParameters, realpath,
                                  removeInstanceRoot, removeProxyDb,
                                  removeSoftwareByName, runSlapgridUntilSuccess,
-                                 saveSession, saveBuildAndRunParams,
+                                 saveBuildAndRunParams,
                                  setMiniShellHistory,
                                  stopProxy,
                                  svcStartStopProcess, svcStartAll, svcStopAll, tail,
                                  updateInstanceParameter)
 
+from git import GitCommandError
 from slapos.runner.fileBrowser import FileBrowser
 from slapos.runner.gittools import (cloneRepo, gitStatus, switchBranch,
-                                    addBranch, getDiff, gitCommit, gitPush, gitPull)
+                                    addBranch, getDiff, gitCommit, gitPush,
+                                    gitPull, updateGitConfig, safeResult)
 
 
 app = Flask(__name__)
@@ -56,7 +58,7 @@ def before_request():
   if request.path.startswith('/static') \
     or request.path == '/isSRReady':
     return
-
+  """
   account = getSession(app.config)
   if account:
     session['title'] = getProjectTitle(app.config)
@@ -64,7 +66,8 @@ def before_request():
     session['title'] = "No account is defined"
     if request.path != "/setAccount" and request.path != "/configAccount":
       return redirect(url_for('setAccount'))
-
+  """
+  session['title'] = getProjectTitle(app.config)
   g.instance_monitoring_url =  app.config['instance_monitoring_url']
 
 # general views
@@ -84,16 +87,24 @@ def login():
 
 @app.route("/setAccount")
 def setAccount():
-  account = getSession(app.config)
+  """account = getSession(app.config)
   if not account:
     return render_template('account.html')
-  return redirect(url_for('login'))
+  return redirect(url_for('login'))"""
 
 
 def myAccount():
-  account = getSession(app.config)
-  return render_template('account.html', username=account[0],
-          email=account[2], name=account[3].decode('utf-8'),
+  # account = getSession(app.config)
+  git_user_path = os.path.join(app.config['etc_dir'], '.git_user')
+  name = email = ""
+  if os.path.exists(git_user_path):
+    with open(git_user_path, 'r') as gfile:
+      name, email = gfile.read().split(';')
+  return render_template(
+    'account.html',
+    username_list=getUsernameList(app.config),
+    email=email,
+    name=name.decode('utf-8'),
     params=getBuildAndRunParams(app.config))
 
 
@@ -103,11 +114,16 @@ def getSlapgridParameters():
 
 def manageRepository():
   public_key = open(app.config['public_key']).read()
-  account = getSession(app.config)
+  account = [] #getSession(app.config)
+  git_user_path = os.path.join(app.config['etc_dir'], '.git_user')
+  name = email = ""
+  if os.path.exists(git_user_path):
+    with open(git_user_path, 'r') as gfile:
+      name, email = gfile.read().split(';')
   return render_template('manageRepository.html', workDir='workspace',
             project=listFolder(app.config, 'workspace'),
-            public_key=public_key, name=account[3].decode('utf-8'),
-            email=account[2])
+            public_key=public_key, name=name.decode('utf-8'),
+            email=email)
 
 
 @app.route("/doLogin", methods=['POST'])
@@ -273,13 +289,13 @@ def openProject(method):
 
 def cloneRepository():
   path = realpath(app.config, request.form['name'], False)
-  data = {
-    'repo': request.form['repo'],
-    'user': request.form['user'],
-    'email': request.form['email'],
-    'path': path
-  }
-  return cloneRepo(data)
+  if not path:
+    return jsonify(code=0, result="Can not access folder: Permission Denied")
+  try:
+    cloneRepo(request.form['repo'], path, request.form['user'], request.form['email'])
+    return jsonify(code=1, result="")
+  except GitCommandError, e:
+    return jsonify(code=0, result=safeResult(str(e)))
 
 
 def listDirectory():
@@ -306,7 +322,11 @@ def setCurrentProject():
 def getProjectStatus():
   path = realpath(app.config, request.form['project'])
   if path:
-    return gitStatus(path)
+    try:
+      result, branch, isdirty = gitStatus(path)
+      return jsonify(code=1, result=result, branch=branch, dirty=isdirty)
+    except GitCommandError, e:
+      return jsonify(code=0, result=safeResult(str(e)))
   else:
     return jsonify(code=0, result="Can not read folder: Permission Denied")
 
@@ -392,7 +412,14 @@ def saveFileContent():
 def changeBranch():
   path = realpath(app.config, request.form['project'])
   if path:
-    return switchBranch(path, request.form['name'])
+    try:
+      if switchBranch(path, request.form['name']):
+        return jsonify(code=1, result="")
+      else:
+        json = "This is already your active branch for this project"
+        return jsonify(code=1, result=json)
+    except GitCommandError, e:
+      return jsonify(code=0, result=safeResult(str(e)))
   else:
     return jsonify(code=0, result="Can not read folder: Permission Denied")
 
@@ -400,10 +427,17 @@ def changeBranch():
 def newBranch():
   path = realpath(app.config, request.form['project'])
   if path:
+    try:
       if request.form['create'] == '1':
-      return addBranch(path, request.form['name'])
+        result = addBranch(path, request.form['name'])
+      else:
+        result =  addBranch(path, request.form['name'], True)
+      if result:
+        return jsonify(code=1, result="")
       else:
-      return addBranch(path, request.form['name'], True)
+        return jsonify(code=0, result="Failed to checkout to branch %s.")
+    except GitCommandError, e:
+      return jsonify(code=0, result=safeResult(str(e)))
   else:
     return jsonify(code=0, result="Can not read folder: Permission Denied")
 
@@ -591,28 +625,34 @@ def updateBuildAndRunConfig():
 
 #update user account data
 def updateAccount():
-  code = request.form['rcode'].strip()
-  recovery_code = getRcode(app.config)
-  if code != recovery_code:
-    return jsonify(code=0, result="Your password recovery code is not valid!")
 
-  account = [
-    request.form['username'].strip(),
-    request.form['password'].strip(),
-    request.form['email'].strip(),
-    request.form['name'].strip()
-  ]
-  result = saveSession(app.config, account)
-  if type(result) == type(""):
-    return jsonify(code=0, result=result)
-  else:
+  username = request.form['username'].strip()
+  password = request.form['password'].strip()
+  new_password = request.form['new_password'].strip()
+  email = request.form['email'].strip()
+  name = request.form['name'].strip()
+
+  if username and password and new_password:
+    if not checkUserCredential(app.config, username, password):
+      return jsonify(code=0, result="Username and password doesn't match for '%s'" % username)
+
+    result = updateUserCredential(app.config, username, new_password)
+    if not result:
+      return jsonify(code=0, result="Failed to update Credentials!")
+
+  try:
+    updateGitConfig(app.config['default_repository_path'], name, email)
+  except GitCommandError, e:
+    return jsonify(code=0, result=str(e))
+  with open(os.path.join(app.config['etc_dir'], '.git_user'), 'w') as gfile:
+    gfile.write('%s;%s' % (name, email))
   return jsonify(code=1, result="")
 
 
 #update user account data
 @app.route("/configAccount", methods=['POST'])
 def configAccount():
-  last_account = getSession(app.config)
+  """last_account = getSession(app.config)
   if last_account:
     return jsonify(code=0,
                    result="Unable to respond to your request, permission denied.")
@@ -630,13 +670,9 @@ def configAccount():
   if type(result) == type(""):
     return jsonify(code=0, result=result)
   else:
-    return jsonify(code=1, result="")
+    return jsonify(code=1, result="")"""
 
 def addUser():
-  code = request.form['rcode'].strip()
-  recovery_code = getRcode(app.config)
-  if code != recovery_code:
-    return jsonify(code=0, result="Your password recovery code is not valid!")
   if createNewUser(app.config, request.form['username'],
                    request.form['password']):
     return jsonify(code=1, result="New user succesfully saved")