diff --git a/server/src/uds/auths/SimpleLDAP/authenticator.py b/server/src/uds/auths/SimpleLDAP/authenticator.py index de7bdc46a..eac5d6b3a 100644 --- a/server/src/uds/auths/SimpleLDAP/authenticator.py +++ b/server/src/uds/auths/SimpleLDAP/authenticator.py @@ -197,9 +197,9 @@ class SimpleLDAPAuthenticator(auths.Authenticator): ) - typeName = _('SimpleLDAP (DEPRECATED)') + typeName = _('SimpleLDAP') typeType = 'SimpleLdapAuthenticator' - typeDescription = _('Simple LDAP authenticator (DEPRECATED)') + typeDescription = _('Simple LDAP authenticator') iconFile = 'auth.png' # If it has and external source where to get "new" users (groups must be declared inside UDS) diff --git a/server/src/uds/transports/HTML5SSH/html5ssh.py b/server/src/uds/transports/HTML5SSH/html5ssh.py index be507691b..3ca0ff705 100644 --- a/server/src/uds/transports/HTML5SSH/html5ssh.py +++ b/server/src/uds/transports/HTML5SSH/html5ssh.py @@ -86,29 +86,29 @@ class HTML5SSHTransport(transports.Transport): tooltip=_('Username for SSH connection authentication.'), tab=gui.CREDENTIALS_TAB, ) - password = gui.PasswordField( - label=_('Password'), - order=21, - tooltip=_('Password for SSH connection authentication'), - tab=gui.CREDENTIALS_TAB, - ) - sshPrivateKey = gui.TextField( - label=_('SSH Private Key'), - order=22, - multiline=4, - tooltip=_( - 'Private key for SSH authentication. If not provided, password authentication is used.' - ), - tab=gui.CREDENTIALS_TAB, - ) - sshPassphrase = gui.PasswordField( - label=_('SSH Private Key Passphrase'), - order=23, - tooltip=_( - 'Passphrase for SSH private key if it is required. If not provided, but it is needed, user will be prompted for it.' - ), - tab=gui.CREDENTIALS_TAB, - ) + # password = gui.PasswordField( + # label=_('Password'), + # order=21, + # tooltip=_('Password for SSH connection authentication'), + # tab=gui.CREDENTIALS_TAB, + # ) + # sshPrivateKey = gui.TextField( + # label=_('SSH Private Key'), + # order=22, + # multiline=4, + # tooltip=_( + # 'Private key for SSH authentication. If not provided, password authentication is used.' + # ), + # tab=gui.CREDENTIALS_TAB, + # ) + # sshPassphrase = gui.PasswordField( + # label=_('SSH Private Key Passphrase'), + # order=23, + # tooltip=_( + # 'Passphrase for SSH private key if it is required. If not provided, but it is needed, user will be prompted for it.' + # ), + # tab=gui.CREDENTIALS_TAB, + # ) sshCommand = gui.TextField( label=_('SSH Command'), @@ -253,9 +253,9 @@ class HTML5SSHTransport(transports.Transport): # Add optional parameters (strings only) for i in ( ('username', self.username), - ('password', self.password), - ('private-key', self.sshPrivateKey), - ('passphrase', self.sshPassphrase), + # ('password', self.password), + # ('private-key', self.sshPrivateKey), + # ('passphrase', self.sshPassphrase), ('command', self.sshCommand), ('host-key', self.sshHostKey), ):