Changeset 3686

Timestamp:

Feb 21, 2017, 3:01:22 PM (3 years ago)

Author:

mabarracus

Message:

Fixed blocking bug when installing without unattended option
Increased password generation
New mirror availability checking before showing netinstall options

Location:

llx-netinstall/trunk/fuentes

Files:

• admin-center-llx-netinstall.install/lliurex-netinstall/src/js/lliurex-netinstall.js (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• install.llx-netinstall/usr/share/n4d/python-plugins/NetinstallManager.py (modified) (3 diffs)

llx-netinstall/trunk/fuentes/admin-center-llx-netinstall.install/lliurex-netinstall/src/js/lliurex-netinstall.js

@@ -160 +160 @@
       var  password=($("#llx_netinstall_setnetinstall_pass").val());
       var  rootpassword=($("#llx_netinstall_setnetinstall_pass_root").val());
+
       if (self.unattended_netinstall){
         if (! username || !password || !rootpassword){
@@ -217 +218 @@
 };
 
+LlxNetinstall.prototype.showMirrorUnavailable=function showMirrorUnavailable(){
+       var self=this;
+       
+       msg="<h4>"+self._("llx_netinstall_mirror_unavailable")+"</h4>";
+       $("#llx_netinstall_config").append(msg);
+}
+
 LlxNetinstall.prototype.checkMirrorAvailable=function checkMirrorAvailable(){
  
@@ -222 +230 @@
    var credentials="";
    var n4dclass="MirrorManager";
-   var n4dmethod="get_all_configs";
+   var n4dmethod="is_mirror_available";
    var arglist="";
       
    Utils.n4d(credentials, n4dclass, n4dmethod, arglist, function(response){
-     if(response.status) self.getNetinstallConfig();
-     else {self.showMirrorUnavailable();
-       msg="<h4>"+self._("llx_netinstall_mirror_unavailable")+"</h4>";
-       $("#llx_netinstall_config").append(msg);
+     if(response.status){
+        self.getNetinstallConfig();
+     } else {
+        self.showMirrorUnavailable();
      }
    });

llx-netinstall/trunk/fuentes/debian/changelog

@@ +1 @@
+llx-netinstall (0.59) xenial; urgency=medium
+
+  * Fixed blocking bug when installing without unattended option
+  * Increased password generation
+  * New mirror availability checking before showing netinstall options 
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Tue, 21 Feb 2017 14:58:32 +0100
+
 llx-netinstall (0.58) xenial; urgency=medium
 

llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/n4d/python-plugins/NetinstallManager.py

@@ -9 +9 @@
 import os
 import subprocess
+import string
+import random
+import crypt
+
 class NetinstallManager:
 
@@ -214 +218 @@
                 Writing in presseed username and password
                 '''                             
-                if not username or not password or not rootpassword:
+                if status == True and (not username or not password or not rootpassword):
                     return {"status":"false", "msg": "Usernames or Passwords can't be an empty string"}
                 try:
@@ -226 +230 @@
                         preseed=open(filepath,'w')
                         preseed.write("# LMD Created user account\n")
-                        salt="sw9.tfRI"                 
-                        userpassencrypted=crypt.crypt(str(password),"$1$"+salt+"$")
-                        rootpassencrypted=crypt.crypt(str(rootpassword),"$1$"+salt+"$")
+                        salt=''.join([random.choice(string.ascii_letters + string.digits) for _ in range(16)])
+                        userpassencrypted=crypt.crypt(str(password),"$6$"+salt+"$")
+                        salt=''.join([random.choice(string.ascii_letters + string.digits) for _ in range(16)])
+                        rootpassencrypted=crypt.crypt(str(rootpassword),"$6$"+salt+"$")
                         
                         if(status==True):