Merge pull request #159 from eywalker/master

Hide password during entry and increment version to 3.3.0

Author: guzman-raphael

+dj/+lib/getpass.m

@@ -0,0 +1,58 @@
+function pass = getpass(prompt)
+%GETPASS  Open up a dialog box for the user to enter password. Password
+%will be hidden as the user enters text. You can pass in an optional
+%argument prompt to be used as the dialog box title. Defaults to "Enter
+%password".
+
+if nargin < 1
+    prompt = 'Enter password';
+end
+
+screenSize = get(0, 'ScreenSize');
+
+% configure the diaglog box
+hfig = figure( ...
+    'Menubar',         'none', ...
+    'Units',           'Pixels', ...
+    'NumberTitle',     'off', ...
+    'Resize',          'off', ...
+    'Name',            prompt, ...
+    'Position',        [(screenSize(3:4)-[300 75])/2 300 75], ...
+    'Color',           [0.8 0.8 0.8], ...
+    'WindowStyle',     'modal');
+
+hpass = uicontrol( ...
+    'Parent',          hfig, ...
+    'Style',           'Text', ...
+    'Tag',             'password', ...
+    'Units',           'Pixels', ...
+    'Position',        [51 30 198 18], ...
+    'FontSize',        15, ...
+    'BackGroundColor', [1 1 1]);
+
+set(hfig,'KeyPressFcn',{@keypress_cb, hpass}, 'CloseRequestFcn','uiresume')
+
+% wait for password entry
+uiwait
+pass = get(hpass,'userdata');
+% remove the figure to prevent passwork leakage
+delete(hfig)
+
+  
+function keypress_cb(hObj, data, hpass)
+% Callback function to handle actual key strokes
+
+    pass = get(hpass,'userdata');
+
+    switch data.Key
+        case 'backspace'
+            pass = pass(1:end-1);
+        case 'return'
+            uiresume
+            return
+        otherwise
+            % append the typed character
+            pass = [pass data.Character];
+    end
+    set(hpass, 'userdata', pass)
+    set(hpass, 'String', char('*' * sign(pass)))

+dj/conn.m

@@ -18,13 +18,19 @@
 % Once established during the first invocation, the connection object cannot
 % be changed. To reset the connection, use 'clear functions' or 'clear classes'.
 
-function connObj = conn(host, user, pass, initQuery, reset, use_tls)
+function connObj = conn(host, user, pass, initQuery, reset, use_tls, nogui)
 persistent CONN
 
-if nargin < 5
+if nargin < 5 || isempty(reset)
     reset = false;
 end
 
+% get password prompt option
+if nargin < 7 || isempty(nogui)
+    nogui = false;
+end
+
+
 if isa(CONN, 'dj.Connection') && ~reset
     assert(nargin==0, ...
         'connection already instantiated. To reconnect, clear functions')
@@ -58,7 +64,11 @@
         pass = getenv(env.pass);
     end
     if isempty(pass)
-        pass = input('Enter datajoint password> ','s');
+        if nogui
+            pass = input('Enter datajoint password> ','s');
+        else
+            pass = dj.lib.getpass('Enter datajoint password');
+        end
     end
 
     % get initial query (if any) to execute when a connection is (re)established
@@ -70,6 +80,7 @@
     if nargin<6 || isempty(use_tls)
         use_tls = dj.set('use_tls');
     end
+    
     if islogical(use_tls) && ~use_tls
         use_tls = 'false';
     elseif islogical(use_tls) && use_tls
@@ -85,8 +96,14 @@
 
 connObj = CONN;
 
+% if connection fails to establish, remove the persistent connection object
 if ~connObj.isConnected
-    query(connObj, 'status')
+    try
+        query(connObj, 'status')
+    catch e
+        CONN = [];
+        rethrow(e) 
+    end
 end
 
 if nargout==0

+dj/version.m

@@ -1,7 +1,7 @@
 function varargout = version
 % report DataJoint version
 
-v = struct('major',3,'minor',2,'bugfix',2);
+v = struct('major',3,'minor',3,'bugfix',0);
 
 if nargout
     varargout{1}=v;