-
Notifications
You must be signed in to change notification settings - Fork 711
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-1289: Duo upgrade to API v4 #966
Conversation
e7143d9
to
8a629e6
Compare
8a629e6
to
b0e5ecd
Compare
Nice @aleitner - thanks for picking this up and taking it over the line! |
@aleitner great news! We are very much looking forward to this, so for testing, do I need to pull from @necouchman 's PR as well or is just pulling from your branch good? |
@stcbus Everything is in this PR - you don't need to pull both of them. |
863841b
to
3562607
Compare
…itly compare state query string.
3562607
to
7c49466
Compare
.../guacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/UserVerificationService.java
Outdated
Show resolved
Hide resolved
guacamole/src/main/java/org/apache/guacamole/rest/auth/ResumableAuthenticationState.java
Outdated
Show resolved
Hide resolved
...uacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/conf/ConfigurationService.java
Show resolved
Hide resolved
...ava/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java
Show resolved
Hide resolved
guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java
Outdated
Show resolved
Hide resolved
...uacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/conf/ConfigurationService.java
Outdated
Show resolved
Hide resolved
...uacamole-auth-duo/src/main/java/org/apache/guacamole/auth/duo/conf/ConfigurationService.java
Outdated
Show resolved
Hide resolved
85100bc
to
e3bb450
Compare
Not sure if this is the correct place to mention this or not, but using this branch works perfectly for me, except on the redirect to Duo, I just see a "LOGIN.INFO_DUO_REDIRECT_PENDING" text. I assume it is missing the translation text for that variable in translations? |
Yes, that string will need to be added here. I don't see any changes present that define that string. If you still see that text after the string is added, you probably just need to clear browser cache. |
Also, just to note (I'm sure it's known!), the docker |
e3bb450
to
8c185ea
Compare
Added the missing translations and revised the guacamole.properties setup for duo |
Thanks @aleitner ! In the interest of accuracy, I believe the application key is no longer used with v4, so that part can be removed from docker/config as well. Please correct, if wrong (I certainly don't pass it in my testing). |
8c185ea
to
9f1a8e6
Compare
Yup, it's no longer necessary so I just removed it. Thanks! |
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.
LGTM
From a quick troubleshooting session, it seems like the re-login button sends you back with the duo token stuff still in the URL field? Maybe that is why? edit: Also confirmed, the duo token and other query parmeters are there right on log on as well. Positive this is it. |
Looking into a fix and I'll add it to my other PR #973 |
I continued working off @necouchman's PR #915 to add support for resuming authentication when dealing with the redirect authentication model