From 1ef9ec807aad0151cbc4be010f5fdaa33b7a39aa Mon Sep 17 00:00:00 2001 From: David Bateman Date: Mon, 13 Apr 2026 23:06:38 +0200 Subject: [PATCH] Correct typos and error in all comments of the PR --- .../auth/openid/conf/ConfigurationService.java | 16 ++++++++-------- .../auth/openid/conf/OpenIDWellKnown.java | 6 +++--- .../auth/openid/util/JsonUrlReader.java | 2 +- .../guacamole/auth/openid/util/PKCEUtil.java | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java index 46f9f918f..a1eb2e64f 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java @@ -314,7 +314,8 @@ public class ConfigurationService { * guacamole.properties. * * @throws GuacamoleException - * endpoint property is missing. + * If guacamole.properties cannot be parsed, or it authorization and + * well-known endpoints are property is missing. */ public URI getAuthorizationEndpoint() throws GuacamoleException { URI authorization_endpoint = environment.getProperty(OPENID_AUTHORIZATION_ENDPOINT); @@ -371,7 +372,7 @@ public class ConfigurationService { * * @throws GuacamoleException * If guacamole.properties cannot be parsed, or if the issuer property - * is missing. + * and well-known endpoints are property is missing. */ public String getIssuer() throws GuacamoleException { String issuer = environment.getProperty(OPENID_ISSUER); @@ -393,8 +394,8 @@ public class ConfigurationService { * guacamole.properties. * * @throws GuacamoleException - * If guacamole.properties cannot be parsed, or if the JWKS endpoint - * property is missing. + * If guacamole.properties cannot be parsed, or if the JWKS and + * well-known endpoints are property is missing. */ public URI getJWKSEndpoint() throws GuacamoleException { URI jwks_uri = environment.getProperty(OPENID_JWKS_ENDPOINT); @@ -414,8 +415,8 @@ public class ConfigurationService { * guacamole.properties. * * @throws GuacamoleException - * If guacamole.properties cannot be parsed, or if the token - * endpoint property is missing. + * If guacamole.properties cannot be parsed, or if the token and + * well-known endpoints are property is missing. */ public URI getTokenEndpoint() throws GuacamoleException { URI token_endpoint = environment.getProperty(OPENID_TOKEN_ENDPOINT); @@ -465,8 +466,7 @@ public class ConfigurationService { * as configured with guacamole.properties. * * @throws GuacamoleException - * If guacamole.properties cannot be parsed, or if the client ID - * property is missing. + * If guacamole.properties cannot be parsed. */ public String getClientSecret() throws GuacamoleException { return environment.getProperty(OPENID_CLIENT_SECRET); diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/OpenIDWellKnown.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/OpenIDWellKnown.java index e74d4c102..0d5178af4 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/OpenIDWellKnown.java +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/OpenIDWellKnown.java @@ -65,12 +65,12 @@ public class OpenIDWellKnown { private static String issuer = null; /** - * The detected authorization edpoint + * The detected authorization endpoint */ private static URI authorization_endpoint = null; /** - * The detected token edpoint + * The detected token endpoint */ private static URI token_endpoint = null; @@ -104,7 +104,7 @@ public class OpenIDWellKnown { * guacamole.properties. * * @throws GuacamoleException - * If guacamole.properties cannot be parsed, or if the authorization + * If guacamole.properties cannot be parsed, or if the well-known * endpoint property is missing. */ private URI getWellKnownEndpoint() throws GuacamoleException { diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/util/JsonUrlReader.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/util/JsonUrlReader.java index ef6b28fcc..6a7a9af0a 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/util/JsonUrlReader.java +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/util/JsonUrlReader.java @@ -53,7 +53,7 @@ public final class JsonUrlReader { * Method to POST or GET to a URL and recover the JSON in the form of a Map * * @param String method - * The htpp method to use. Should be "GET", "POST" or "PATCH". + * The http method to use. Should be "GET", "POST" or "PATCH". * * @param URI uri * A URI value giving the address where to recover the JSON diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/util/PKCEUtil.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/util/PKCEUtil.java index 8257a8a3c..9b1831219 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/util/PKCEUtil.java +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/util/PKCEUtil.java @@ -31,7 +31,7 @@ import java.security.SecureRandom; */ public final class PKCEUtil { /** - * Get the verifier data from a secure random source + * Get the verifier data from a cryptographically secure random source */ private static final SecureRandom RANDOM = new SecureRandom(); @@ -56,7 +56,7 @@ public final class PKCEUtil { * Computes the PKCE code_challenge = BASE64URL(SHA256(code_verifier)). * * @param String verifier - * A string containing the S56 verifier calculated bu generateCodeVerifier + * A string containing the S256 verifier calculated bu generateCodeVerifier * * @return * The generated S256 code challenge used for the PKCE request encoded @@ -72,7 +72,7 @@ public final class PKCEUtil { * Base64URL encoding without padding. * * @param bytes - * The bytes to be Base54 URL encoded + * The bytes to be Base64 URL encoded * * @return * The Base64 URL encoded string value corresponding to the bytes