-
Notifications
You must be signed in to change notification settings - Fork 736
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
GUACAMOLE-577: Support for configuring the Guacamole Proxy in LDAP Connections #353
Conversation
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
Show resolved
Hide resolved
Okay, fixed a few things up and made some of the requested changes. Let me know how it looks, now. |
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
Outdated
Show resolved
Hide resolved
...s/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java
Outdated
Show resolved
Hide resolved
I may end up closing this PR and just redoing it - I tried to resolve the conflicts between current master and this PR, and it was feeling a little like the kitty-in-a-bathtub gif... |
Ah, yes. That gif captures the feeling of refactoring so perfectly. |
6786e23
to
1eb479d
Compare
Okay, @mike-jumper, I've reworked this on top of the existing master, so I think it's good, now... |
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
Outdated
Show resolved
Hide resolved
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
Outdated
Show resolved
Hide resolved
guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java
Outdated
Show resolved
Hide resolved
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
...camole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/ConfigurationService.java
Outdated
Show resolved
Hide resolved
865e2c6
to
e6989d9
Compare
I reworked the proxy attributes from LDAP as you suggested, but came across a couple of things:
|
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
...ole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
4b9c977
to
bbe957d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge conflict, but otherwise LGTM.
Merge conflict is resolved. |
This pull request implements the changes necessary to support the
GuacamoleProxyConfiguration
in LDAP connections (and any future extensions that make use of theSimpleConnection
class. Not entirely sure this is the right/best way to go, but took a stab at it.