safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into GUAC-546-REWRITE

Browse Source 
Conflicts:
	guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/protocol/ProtocolRetrievalService.java
	guacamole/src/main/webapp/scripts/admin-ui.js
	guacamole/src/main/webapp/scripts/service.js
This commit is contained in:
Michael Jumper
2014-11-23 13:06:12 -08:00
parent ad6d7a614e 534f4f45c1
commit b68f9a0a26
6 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ProtocolParameter.java
View File

@@ -43,7 +43,19 @@ public class ProtocolParameter {
TEXT,
/**
* A password parameter, whose value is sensitive and must be hidden.
* A username parameter. This parameter type generally behaves
* identically to arbitrary text parameters, but has semantic
* differences. If credential pass-through is in use, the value for this
* parameter may be automatically provided using the credentials
* originally used by the user to authenticate.
*/
USERNAME,
/**
* A password parameter, whose value is sensitive and must be hidden. If
* credential pass-through is in use, the value for this parameter may
* be automatically provided using the credentials originally used by
* the user to authenticate.
*/
PASSWORD,

4
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/xml/protocol/ParamTagHandler.java
View File

@@ -57,6 +57,10 @@ public class ParamTagHandler implements TagHandler {
else if ("numeric".equals(type))
protocolParameter.setType(ProtocolParameter.Type.NUMERIC);
// Username field
else if ("username".equals(type))
protocolParameter.setType(ProtocolParameter.Type.USERNAME);
// Password field
else if ("password".equals(type))
protocolParameter.setType(ProtocolParameter.Type.PASSWORD);

2
guacamole/src/main/resources/net/sourceforge/guacamole/net/protocols/rdp.xml
View File

@@ -3,7 +3,7 @@
<param name="hostname" type="text" title="Hostname"/>
<param name="port" type="numeric" title="Port"/>
<param name="username" type="text" title="Username"/>
<param name="username" type="username" title="Username"/>
<param name="password" type="password" title="Password"/>
<param name="domain" type="text" title="Domain"/>
<param name="initial-program" type="text" title="Initial program"/>

2
guacamole/src/main/resources/net/sourceforge/guacamole/net/protocols/ssh.xml
View File

@@ -3,7 +3,7 @@
<param name="hostname" title="Hostname" type="text"/>
<param name="port" title="Port" type="numeric"/>
<param name="username" title="Username" type="text"/>
<param name="username" title="Username" type="username"/>
<param name="password" title="Password" type="password"/>
<param name="font-name" title="Font name" type="text"/>

2
guacamole/src/main/resources/net/sourceforge/guacamole/net/protocols/telnet.xml
View File

@@ -3,7 +3,7 @@
<param name="hostname" title="Hostname" type="text"/>
<param name="port" title="Port" type="numeric"/>
<param name="username" title="Username" type="text"/>
<param name="username" title="Username" type="username"/>
<param name="password" title="Password" type="password"/>
<param name="password-regex"

1
guacamole/src/main/webapp/app/manage/templates/connectionParameter.html
View File

@@ -22,6 +22,7 @@
-->
<input ng-show="parameterType === 'TEXT'" type="text" ng-model="connectionParameters[parameterName]"/>
<input ng-show="parameterType === 'NUMERIC'" type="number" ng-model="connectionParameters[parameterName]"/>
<input ng-show="parameterType === 'USERNAME'" type="text" ng-model="connectionParameters[parameterName]"/>
<input ng-show="parameterType === 'PASSWORD'" type="password" ng-model="connectionParameters[parameterName]"/>
<input ng-show="parameterType === 'BOOLEAN'" type="checkbox" ng-model="connectionParameters[parameterName]"/>
<select ng-show="parameterType === 'ENUM'" ng-model="connectionParameters[parameterName]" ng-options="option.value as 'protocol.' + connection.protocol + '.parameters.' + parameter.name + '.options.' + (option.value || 'empty') | translate for option in parameter.options | orderBy: value"></select>