[jira] [Commented] (GUACAMOLE-197) Implement Support for RADIUS Authentication

2017-06-05 Thread Colin Gordon (JIRA)

[ 
https://issues.apache.org/jira/browse/GUACAMOLE-197?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16037634#comment-16037634
 ] 

Colin Gordon commented on GUACAMOLE-197:


[~nick.couch...@yahoo.com] Correct, it looks like it would need to be a DB + 
RADIUS implementation, since there is not a way currently to return connection 
information from a RADIUS server like with LDAP. My guess is that yes, it would 
require the creation of connection "groups" on the Guac side, then the returned 
RADIUS attributes could correspond to the groups. RADIUS accounting is not 
critical since we can grab log info via Syslog, but I support RADIUS 
interim-updates with similar Syslog-like data would be nice.

I would love to contribute code if I had the skill. I'm more of an 
implementation and systems specialist. Thanks!

> Implement Support for RADIUS Authentication
> ---
>
> Key: GUACAMOLE-197
> URL: https://issues.apache.org/jira/browse/GUACAMOLE-197
> Project: Guacamole
>  Issue Type: Improvement
>  Components: guacamole, guacamole-client
>Reporter: Nick Couchman
>Assignee: Nick Couchman
>Priority: Minor
> Fix For: 0.9.14-incubating
>
>
> Working on implementing a RADIUS authentication module - 
> guacamole-auth-radius.  The basic implementation is completed - with a basic 
> PAP or CHAP RADIUS server, the authentication succeeds and the user is logged 
> in.
> I'm running into an issue, though, trying to implement Challenge/Response in 
> RADIUS.  I have my RADIUS server configured to talk to LinOTP for MFA/2FA, 
> and RADIUS sends the AccessChallenge package back, asking for the second 
> factor.  My issue is in my continual failure to grasp the connection between 
> the servlet side and the AngularJS web application.  I've copied the Duo 
> authentication code and tried to morph it into something that will present 
> another box for the RADIUS challenge, but I can't get my controller function 
> to actually fire.
> Once that is working, I'd like to support other RADIUS authentication 
> protocols, like EAP-TLS and EAP-TTLS, so there's a little more work to be 
> done, but right now I'm focusing on the basic protocols and the 
> challenge/response.
> Will have a repo posted here in a moment for working on this.



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)


[jira] [Resolved] (GUACAMOLE-314) Bump version numbers to 0.9.13-incubating

2017-06-05 Thread Michael Jumper (JIRA)

 [ 
https://issues.apache.org/jira/browse/GUACAMOLE-314?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Jumper resolved GUACAMOLE-314.
--
Resolution: Done

Should be OK now.

> Bump version numbers to 0.9.13-incubating
> -
>
> Key: GUACAMOLE-314
> URL: https://issues.apache.org/jira/browse/GUACAMOLE-314
> Project: Guacamole
>  Issue Type: Task
>  Components: Documentation, guacamole-client, guacamole-server
>Reporter: Michael Jumper
>Assignee: Michael Jumper
> Fix For: 0.9.13-incubating
>
>
> As [the scope of 0.9.13-incubating has been 
> finalized|https://lists.apache.org/thread.html/4dcdce2c5c7e60ac9d86257c83c8e787ab02d8c78a9b2a8f20994403@%3Cdev.guacamole.apache.org%3E],
>  and the release branches have been created, the version numbers of all 
> modified components need to be bumped to 0.9.13-incubating.
> Only things which have actually changed should be bumped. This includes 
> component versions and, in the case of libguac, the SO version (libtool 
> version info, which must be incremented only according to [strict 
> guidelines|https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html]).



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)


[jira] [Commented] (GUACAMOLE-197) Implement Support for RADIUS Authentication

2017-06-05 Thread Nick Couchman (JIRA)

[ 
https://issues.apache.org/jira/browse/GUACAMOLE-197?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16037421#comment-16037421
 ] 

Nick Couchman commented on GUACAMOLE-197:
-

{quote}
Hello, I love that Guacamole is including RADIUS auth. I routinely use OpenOTP 
as a 2factor RADIUS server, and enabling Guacamole as a RADIUS client will make 
it eminently more useful for my purposes.
{quote}

Glad to hear I'm not the only one interested in it.

{quote}
One additional feature I hope this project may consider adding is the ability 
to filter which configuration a user has access to upon authentication. With 
LDAP, Guacamole has the ability to provide a user access to a configuration 
based on which LDAP group the user is a member of (see here 
https://guacamole.incubator.apache.org/doc/0.9.3/gug/ldap-auth.html). This can 
be done with RADIUS as well, but requires the RADIUS client implementation to 
"look" at attributes that are returned by the RADIUS server.
{quote}

I have plans (in my head, anyway) to expand RADIUS support in Guacamole later 
on for both authorization and accounting features, which I think would cover 
what you're talking about, here.  At the moment, this extension only does 
authentication and relies on other stacked authentication modules to provide 
the actual connection information.  The feature that you're referencing in the 
LDAP Authentication module works when the connections are stored in LDAP, and 
the LDAP directory is used for both authentication and connection information.  
If you layer LDAP with DB, you're left with the same challenge - the 
connections in the DB layer must be managed apart from the directory tree.

I think there's also a JIRA issue opened at the moment to add group support to 
the Guacamole client, which would also probably address the challenges, here - 
I would image that would also resolve the challenge you're facing of having to 
administer user/connection permissions on an individual basis.  The combination 
of the two - groups in Guacamole and an improved RADIUS module - is certainly 
an ideal place to get.

If you're able to contribute code to the effort I'd welcome the contribution!

> Implement Support for RADIUS Authentication
> ---
>
> Key: GUACAMOLE-197
> URL: https://issues.apache.org/jira/browse/GUACAMOLE-197
> Project: Guacamole
>  Issue Type: Improvement
>  Components: guacamole, guacamole-client
>Reporter: Nick Couchman
>Assignee: Nick Couchman
>Priority: Minor
> Fix For: 0.9.14-incubating
>
>
> Working on implementing a RADIUS authentication module - 
> guacamole-auth-radius.  The basic implementation is completed - with a basic 
> PAP or CHAP RADIUS server, the authentication succeeds and the user is logged 
> in.
> I'm running into an issue, though, trying to implement Challenge/Response in 
> RADIUS.  I have my RADIUS server configured to talk to LinOTP for MFA/2FA, 
> and RADIUS sends the AccessChallenge package back, asking for the second 
> factor.  My issue is in my continual failure to grasp the connection between 
> the servlet side and the AngularJS web application.  I've copied the Duo 
> authentication code and tried to morph it into something that will present 
> another box for the RADIUS challenge, but I can't get my controller function 
> to actually fire.
> Once that is working, I'd like to support other RADIUS authentication 
> protocols, like EAP-TLS and EAP-TTLS, so there's a little more work to be 
> done, but right now I'm focusing on the basic protocols and the 
> challenge/response.
> Will have a repo posted here in a moment for working on this.



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)


[jira] [Commented] (GUACAMOLE-197) Implement Support for RADIUS Authentication

2017-06-05 Thread Colin Gordon (JIRA)

[ 
https://issues.apache.org/jira/browse/GUACAMOLE-197?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16037410#comment-16037410
 ] 

Colin Gordon commented on GUACAMOLE-197:


Hello, I love that Guacamole is including RADIUS auth. I routinely use OpenOTP 
as a 2factor RADIUS server, and enabling Guacamole as a RADIUS client will make 
it eminently more useful for my purposes.

One additional feature I hope this project may consider adding is the ability 
to filter which configuration a user has access to upon authentication. With 
LDAP, Guacamole has the ability to provide a user access to a configuration 
based on which LDAP group the user is a member of (see here 
https://guacamole.incubator.apache.org/doc/0.9.3/gug/ldap-auth.html). This can 
be done with RADIUS as well, but requires the RADIUS client implementation to 
"look" at attributes that are returned by the RADIUS server. 

Many vendors implement this feature via vendor-specific attributes. This would 
require Guacamole to have its own RADIUS dictionary. However, Guacamole could 
choose to simple check the RADIUS Class attribute, and allow the user access to 
a configuration that matches the string within the Class attribute (see here: 
https://tools.ietf.org/html/rfc2865#page-46). This would allow a user logging 
in to view the "admins" configuration, if the Class attribute return "admins" 
(in FreeRADIUS, "Class := "admins"). You could even expand it to allow access 
to multiple configurations by using a delimiter ("Class := 
"admins;RDPUsers;SSHUsers"). 

Anyway, thanks for RADIUS support!

> Implement Support for RADIUS Authentication
> ---
>
> Key: GUACAMOLE-197
> URL: https://issues.apache.org/jira/browse/GUACAMOLE-197
> Project: Guacamole
>  Issue Type: Improvement
>  Components: guacamole, guacamole-client
>Reporter: Nick Couchman
>Assignee: Nick Couchman
>Priority: Minor
> Fix For: 0.9.14-incubating
>
>
> Working on implementing a RADIUS authentication module - 
> guacamole-auth-radius.  The basic implementation is completed - with a basic 
> PAP or CHAP RADIUS server, the authentication succeeds and the user is logged 
> in.
> I'm running into an issue, though, trying to implement Challenge/Response in 
> RADIUS.  I have my RADIUS server configured to talk to LinOTP for MFA/2FA, 
> and RADIUS sends the AccessChallenge package back, asking for the second 
> factor.  My issue is in my continual failure to grasp the connection between 
> the servlet side and the AngularJS web application.  I've copied the Duo 
> authentication code and tried to morph it into something that will present 
> another box for the RADIUS challenge, but I can't get my controller function 
> to actually fire.
> Once that is working, I'd like to support other RADIUS authentication 
> protocols, like EAP-TLS and EAP-TTLS, so there's a little more work to be 
> done, but right now I'm focusing on the basic protocols and the 
> challenge/response.
> Will have a repo posted here in a moment for working on this.



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)


[3/5] incubator-guacamole-client git commit: GUACAMOLE-314: Merge extension API sanity check version number bump.

2017-06-05 Thread jmuehlner
GUACAMOLE-314: Merge extension API sanity check version number bump.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/193089fb
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/193089fb
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/193089fb

Branch: refs/heads/master
Commit: 193089fb66cf2d113c3766de12d4f38a5609498e
Parents: bedd09f 6c0957e
Author: James Muehlner 
Authored: Mon Jun 5 11:30:08 2017 -0700
Committer: James Muehlner 
Committed: Mon Jun 5 11:30:08 2017 -0700

--
 .../main/java/org/apache/guacamole/extension/ExtensionModule.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--




[2/5] incubator-guacamole-client git commit: GUACAMOLE-189: Define guacd override columns for guacamole_connection table in main schema init script.

2017-06-05 Thread jmuehlner
GUACAMOLE-189: Define guacd override columns for guacamole_connection table in 
main schema init script.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/8286b21b
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/8286b21b
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/8286b21b

Branch: refs/heads/master
Commit: 8286b21baad0f3a7a380b41299b547b73c11f74d
Parents: 24708cf
Author: Michael Jumper 
Authored: Sun Jun 4 16:06:16 2017 -0700
Committer: Michael Jumper 
Committed: Sun Jun 4 16:06:16 2017 -0700

--
 .../schema/001-create-schema.sql  |  5 +
 .../schema/001-create-schema.sql  | 14 ++
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8286b21b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
--
diff --git 
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
 
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
index 29bc47a..519d5ca 100644
--- 
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
+++ 
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
@@ -57,6 +57,11 @@ CREATE TABLE `guacamole_connection` (
   `parent_id`   int(11),
   `protocol`varchar(32)  NOT NULL,
   
+  -- Guacamole proxy (guacd) overrides
+  `proxy_port`  integer,
+  `proxy_hostname`  varchar(512),
+  `proxy_encryption_method` enum('NONE', 'SSL'),
+
   -- Concurrency limits
   `max_connections`  int(11),
   `max_connections_per_user` int(11),

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8286b21b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
--
diff --git 
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
 
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
index f9b2351..e018617 100644
--- 
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
+++ 
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
@@ -50,6 +50,15 @@ CREATE TYPE guacamole_system_permission_type AS ENUM(
 );
 
 --
+-- Guacamole proxy (guacd) encryption methods
+--
+
+CREATE TYPE guacamole_proxy_encryption_method AS ENUM(
+'NONE',
+'SSL'
+);
+
+--
 -- Table of connection groups. Each connection group has a name.
 --
 
@@ -97,6 +106,11 @@ CREATE TABLE guacamole_connection (
   max_connections  integer,
   max_connections_per_user integer,
 
+  -- Guacamole proxy (guacd) overrides
+  proxy_port  integer,
+  proxy_hostname  varchar(512),
+  proxy_encryption_method guacamole_proxy_encryption_method,
+
   PRIMARY KEY (connection_id),
 
   CONSTRAINT connection_name_parent



[1/5] incubator-guacamole-client git commit: GUACAMOLE-314: Update extension API version sanity check to include the correct, recently-bumped version number.

2017-06-05 Thread jmuehlner
Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master bedd09fc1 -> 91920d0b2


GUACAMOLE-314: Update extension API version sanity check to include the 
correct, recently-bumped version number.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/6c0957e7
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/6c0957e7
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/6c0957e7

Branch: refs/heads/master
Commit: 6c0957e7dedb47afe20b9ae2b5c5219c5cca3e75
Parents: 24708cf
Author: Michael Jumper 
Authored: Sun Jun 4 13:18:57 2017 -0700
Committer: Michael Jumper 
Committed: Sun Jun 4 13:18:57 2017 -0700

--
 .../main/java/org/apache/guacamole/extension/ExtensionModule.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/6c0957e7/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
--
diff --git 
a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java 
b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
index 528f786..792066c 100644
--- 
a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
+++ 
b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
@@ -59,7 +59,7 @@ public class ExtensionModule extends ServletModule {
 private static final List ALLOWED_GUACAMOLE_VERSIONS =
 Collections.unmodifiableList(Arrays.asList(
 "*",
-"0.9.12-incubating"
+"0.9.13-incubating"
 ));
 
 /**



[5/5] incubator-guacamole-client git commit: Merge 0.9.13-incubating changes back to master.

2017-06-05 Thread jmuehlner
Merge 0.9.13-incubating changes back to master.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/91920d0b
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/91920d0b
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/91920d0b

Branch: refs/heads/master
Commit: 91920d0b2d806de1a32908fa528b51ceb9068288
Parents: bedd09f 80b681e
Author: James Muehlner 
Authored: Mon Jun 5 11:35:48 2017 -0700
Committer: James Muehlner 
Committed: Mon Jun 5 11:35:48 2017 -0700

--
 .../schema/001-create-schema.sql  |  5 +
 .../schema/001-create-schema.sql  | 14 ++
 .../apache/guacamole/extension/ExtensionModule.java   |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
--




[4/5] incubator-guacamole-client git commit: GUACAMOLE-189: Merge addition of guacd override columns to schema creation scripts.

2017-06-05 Thread jmuehlner
GUACAMOLE-189: Merge addition of guacd override columns to schema creation 
scripts.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/80b681e1
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/80b681e1
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/80b681e1

Branch: refs/heads/master
Commit: 80b681e18d621006734c2444c4e895dc5275fa56
Parents: 193089f 8286b21
Author: James Muehlner 
Authored: Mon Jun 5 11:32:38 2017 -0700
Committer: James Muehlner 
Committed: Mon Jun 5 11:32:38 2017 -0700

--
 .../schema/001-create-schema.sql  |  5 +
 .../schema/001-create-schema.sql  | 14 ++
 2 files changed, 19 insertions(+)
--




[2/2] incubator-guacamole-client git commit: GUACAMOLE-189: Merge addition of guacd override columns to schema creation scripts.

2017-06-05 Thread jmuehlner
GUACAMOLE-189: Merge addition of guacd override columns to schema creation 
scripts.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/80b681e1
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/80b681e1
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/80b681e1

Branch: refs/heads/staging/0.9.13-incubating
Commit: 80b681e18d621006734c2444c4e895dc5275fa56
Parents: 193089f 8286b21
Author: James Muehlner 
Authored: Mon Jun 5 11:32:38 2017 -0700
Committer: James Muehlner 
Committed: Mon Jun 5 11:32:38 2017 -0700

--
 .../schema/001-create-schema.sql  |  5 +
 .../schema/001-create-schema.sql  | 14 ++
 2 files changed, 19 insertions(+)
--




[1/2] incubator-guacamole-client git commit: GUACAMOLE-189: Define guacd override columns for guacamole_connection table in main schema init script.

2017-06-05 Thread jmuehlner
Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/staging/0.9.13-incubating 193089fb6 -> 80b681e18


GUACAMOLE-189: Define guacd override columns for guacamole_connection table in 
main schema init script.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/8286b21b
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/8286b21b
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/8286b21b

Branch: refs/heads/staging/0.9.13-incubating
Commit: 8286b21baad0f3a7a380b41299b547b73c11f74d
Parents: 24708cf
Author: Michael Jumper 
Authored: Sun Jun 4 16:06:16 2017 -0700
Committer: Michael Jumper 
Committed: Sun Jun 4 16:06:16 2017 -0700

--
 .../schema/001-create-schema.sql  |  5 +
 .../schema/001-create-schema.sql  | 14 ++
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8286b21b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
--
diff --git 
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
 
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
index 29bc47a..519d5ca 100644
--- 
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
+++ 
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
@@ -57,6 +57,11 @@ CREATE TABLE `guacamole_connection` (
   `parent_id`   int(11),
   `protocol`varchar(32)  NOT NULL,
   
+  -- Guacamole proxy (guacd) overrides
+  `proxy_port`  integer,
+  `proxy_hostname`  varchar(512),
+  `proxy_encryption_method` enum('NONE', 'SSL'),
+
   -- Concurrency limits
   `max_connections`  int(11),
   `max_connections_per_user` int(11),

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8286b21b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
--
diff --git 
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
 
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
index f9b2351..e018617 100644
--- 
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
+++ 
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
@@ -50,6 +50,15 @@ CREATE TYPE guacamole_system_permission_type AS ENUM(
 );
 
 --
+-- Guacamole proxy (guacd) encryption methods
+--
+
+CREATE TYPE guacamole_proxy_encryption_method AS ENUM(
+'NONE',
+'SSL'
+);
+
+--
 -- Table of connection groups. Each connection group has a name.
 --
 
@@ -97,6 +106,11 @@ CREATE TABLE guacamole_connection (
   max_connections  integer,
   max_connections_per_user integer,
 
+  -- Guacamole proxy (guacd) overrides
+  proxy_port  integer,
+  proxy_hostname  varchar(512),
+  proxy_encryption_method guacamole_proxy_encryption_method,
+
   PRIMARY KEY (connection_id),
 
   CONSTRAINT connection_name_parent



[2/3] incubator-guacamole-client git commit: GUACAMOLE-314: Update extension API version sanity check to include the correct, recently-bumped version number.

2017-06-05 Thread jmuehlner
GUACAMOLE-314: Update extension API version sanity check to include the 
correct, recently-bumped version number.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/6c0957e7
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/6c0957e7
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/6c0957e7

Branch: refs/heads/staging/0.9.13-incubating
Commit: 6c0957e7dedb47afe20b9ae2b5c5219c5cca3e75
Parents: 24708cf
Author: Michael Jumper 
Authored: Sun Jun 4 13:18:57 2017 -0700
Committer: Michael Jumper 
Committed: Sun Jun 4 13:18:57 2017 -0700

--
 .../main/java/org/apache/guacamole/extension/ExtensionModule.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/6c0957e7/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
--
diff --git 
a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java 
b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
index 528f786..792066c 100644
--- 
a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
+++ 
b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
@@ -59,7 +59,7 @@ public class ExtensionModule extends ServletModule {
 private static final List ALLOWED_GUACAMOLE_VERSIONS =
 Collections.unmodifiableList(Arrays.asList(
 "*",
-"0.9.12-incubating"
+"0.9.13-incubating"
 ));
 
 /**



[1/3] incubator-guacamole-client git commit: Merging 0.9.13-incubating changes back to master.

2017-06-05 Thread jmuehlner
Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/staging/0.9.13-incubating 24708cf91 -> 193089fb6


Merging 0.9.13-incubating changes back to master.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/bedd09fc
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/bedd09fc
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/bedd09fc

Branch: refs/heads/staging/0.9.13-incubating
Commit: bedd09fc104c2c9b8f9e8b76d44482d77eb69473
Parents: 3beedd1 24708cf
Author: Nick Couchman 
Authored: Sat Jun 3 23:01:50 2017 -0400
Committer: Nick Couchman 
Committed: Sat Jun 3 23:01:50 2017 -0400

--
 doc/guacamole-example/pom.xml| 6 +++---
 doc/guacamole-playback-example/pom.xml   | 4 ++--
 extensions/guacamole-auth-cas/pom.xml| 6 +++---
 .../guacamole-auth-cas/src/main/resources/guac-manifest.json | 2 +-
 extensions/guacamole-auth-duo/pom.xml| 4 ++--
 .../guacamole-auth-duo/src/main/resources/guac-manifest.json | 2 +-
 extensions/guacamole-auth-header/pom.xml | 4 ++--
 .../src/main/resources/guac-manifest.json| 2 +-
 .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +-
 .../modules/guacamole-auth-jdbc-dist/pom.xml | 6 +++---
 .../modules/guacamole-auth-jdbc-mysql/pom.xml| 4 ++--
 .../src/main/resources/guac-manifest.json| 2 +-
 .../modules/guacamole-auth-jdbc-postgresql/pom.xml   | 4 ++--
 .../src/main/resources/guac-manifest.json| 2 +-
 extensions/guacamole-auth-jdbc/pom.xml   | 4 ++--
 extensions/guacamole-auth-ldap/pom.xml   | 4 ++--
 .../src/main/resources/guac-manifest.json| 2 +-
 extensions/guacamole-auth-noauth/pom.xml | 4 ++--
 .../src/main/resources/guac-manifest.json| 2 +-
 guacamole-common-js/pom.xml  | 2 +-
 guacamole-common-js/src/main/webapp/modules/Version.js   | 2 +-
 guacamole-common/pom.xml | 2 +-
 guacamole-ext/pom.xml| 4 ++--
 guacamole/pom.xml| 8 
 pom.xml  | 2 +-
 25 files changed, 43 insertions(+), 43 deletions(-)
--




[3/3] incubator-guacamole-client git commit: GUACAMOLE-314: Merge extension API sanity check version number bump.

2017-06-05 Thread jmuehlner
GUACAMOLE-314: Merge extension API sanity check version number bump.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/193089fb
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/193089fb
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/193089fb

Branch: refs/heads/staging/0.9.13-incubating
Commit: 193089fb66cf2d113c3766de12d4f38a5609498e
Parents: bedd09f 6c0957e
Author: James Muehlner 
Authored: Mon Jun 5 11:30:08 2017 -0700
Committer: James Muehlner 
Committed: Mon Jun 5 11:30:08 2017 -0700

--
 .../main/java/org/apache/guacamole/extension/ExtensionModule.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--