GUACAMOLE-1949 Nextcloud JWT Auth extension #984
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jmuehlner
reviewed
May 23, 2024
...e-auth-nextcloud/src/main/java/org/apache/guacamole/auth/nextcloud/ConfigurationService.java
Show resolved
Hide resolved
jmuehlner
reviewed
May 23, 2024
...e-auth-nextcloud/src/main/java/org/apache/guacamole/auth/nextcloud/ConfigurationService.java
Show resolved
Hide resolved
jmuehlner
reviewed
May 23, 2024
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
jmuehlner
reviewed
May 23, 2024
...e-auth-nextcloud/src/main/java/org/apache/guacamole/auth/nextcloud/user/UserDataService.java
Outdated
Show resolved
Hide resolved
jmuehlner
reviewed
May 23, 2024
...e-auth-nextcloud/src/main/java/org/apache/guacamole/auth/nextcloud/user/UserDataService.java
Outdated
Show resolved
Hide resolved
jmuehlner
reviewed
May 23, 2024
...extcloud/src/main/java/org/apache/guacamole/auth/nextcloud/connection/ConnectionService.java
Outdated
Show resolved
Hide resolved
necouchman
requested changes
May 30, 2024
There was a problem hiding this comment.
A few more changes from me - at this point mostly style and documentation.
Also, your pull request and commit messages are formatted slightly incorrectly - should be:
GUACAMOLE-1949: Nextcloud JWT authentication extension
with a ":" between the Jira issue and the comment.
extensions/guacamole-auth-nextcloud/src/main/resources/guac-manifest.json
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...th-nextcloud/src/main/java/org/apache/guacamole/auth/nextcloud/RequestValidationService.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...e-auth-nextcloud/src/main/java/org/apache/guacamole/auth/nextcloud/ConfigurationService.java
Outdated
Show resolved
Hide resolved
necouchman
reviewed
May 30, 2024
added 13 commits
June 1, 2024 16:16
added 8 commits
June 1, 2024 16:20
added 4 commits
June 8, 2024 09:46
necouchman
requested changes
Jun 8, 2024
There was a problem hiding this comment.
A few more things to tweak - it's getting very close :-).
In general, make sure you're following established style guidelines within the code. In particular:
- Don't cuddle braces for both
if...elseandtry...catchstatements. - Make sure your JavaDoc comments are properly spaced.
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
| } | ||
| } | ||
|
|
||
| private boolean validIpAddress(final String ipAddress) throws GuacamoleException { |
There was a problem hiding this comment.
Please put empty lines between @param, @return, and @throws.
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
added 8 commits
June 9, 2024 06:53
|
Thank you for your patience. I've cleaned up a bit and hope it doesn't look any worse as a result 😁 |
necouchman
requested changes
Jun 15, 2024
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
...ud/src/main/java/org/apache/guacamole/auth/nextcloud/NextcloudJwtAuthenticationProvider.java
Outdated
Show resolved
Hide resolved
added 7 commits
June 15, 2024 18:12
|
I've added a README.md to explain the configuration. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi all,
I have built a small extension for myself and would like to share it with you. Maybe this is a function that would go well with Guacamole.
I use a self-hosted Nextcloud and the plugin “External Sites”. This plugin offers the possibility to send a JWT to an embedded website. This JWT is (Nextcloud) user-related and always valid for 1 minute. If the JWT is missing or has expired, an excpetion will be thrown. The extension validates the JWT and if it is valid, the Guacamole login screen is displayed. Everything else then proceeds as usual. Additionally, I have implemented that only certain Nextcloud users are allowed this access, independent of a valid JWT.
I have decided to not make the login screen accessible worldwide, that's why an exception will be thrown if anyone call the guacamole client directly (
https://example.com/guacamole) and a login is only possible within the Nextcloud (https://cloud.example.com/).Another small additional use case in my environment: The login screen should still be displayed for a few clients (via IP addresses), so the IP address will be checked and validated.
Jira Ticket GUACAMOLE-1949