safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-09 14:41:21 +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);