github-advanced-security[bot] commented on code in PR #17340:
URL:
https://github.com/apache/dolphinscheduler/pull/17340#discussion_r2232831692
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoginController.java:
##########
@@ -263,4 +302,77 @@
"oauth2", "oauth2 auth error"));
}
}
+
+ /**
+ * Handle OIDC callback
+ *
+ * @param code authorization code
+ * @param state state parameter
+ * @param providerId OIDC provider ID
+ * @param request HTTP request
+ * @param response HTTP response
+ */
+ @SneakyThrows
+ @Operation(summary = "handleOidcCallback", description =
"HANDLE_OIDC_CALLBACK")
+ @GetMapping("login/oauth2/code/{providerId}")
+ public void handleOidcCallback(@RequestParam(name = "code", required =
false) String code,
+ @RequestParam(name = "error", required =
false) String error,
+ @RequestParam(name = "state") String state,
+ @PathVariable String providerId,
+ HttpServletRequest request,
+ HttpServletResponse response) throws
IOException {
+
+ // Handle login failure from OIDC provider
+ if (error != null) {
+ log.error("OIDC login failed with error: {}.", error);
+
response.sendRedirect("/dolphinscheduler/ui/#/login?error=oidc_login_failed");
+ return;
+ }
+
+ // Handle the case where code is missing without an error
+ if (code == null) {
+ log.error("OIDC login failed: The authorization code was not
provided.");
+
response.sendRedirect("/dolphinscheduler/ui/#/login?error=oidc_missing_code");
+ return;
+ }
+
+ try {
+ if (!(authenticator instanceof OidcAuthenticator)) {
+ log.error("OIDC authentication is not active or authenticator
type is incorrect.");
+
response.sendRedirect("/dolphinscheduler/ui/#/login?error=oidc_not_enabled");
+ return;
+ }
+
+ User user = ((OidcAuthenticator) authenticator).login(state, code);
+
+ if (user == null) {
+ log.error("OIDC authentication failed. User could not be
authenticated or created.");
+
response.sendRedirect("/dolphinscheduler/ui/#/login?error=oidc_authentication_failed");
+ return;
+ }
+
+ Session session = sessionService.createSessionIfAbsent(user);
+
+ response.setStatus(HttpStatus.SC_MOVED_TEMPORARILY);
+
response.sendRedirect(String.format("%s/login?sessionId=%s&authType=%s",
+ uiUrl, session.getId(), "oidc"));
+ } catch (Exception ex) {
+ log.error("A critical error occurred during the OIDC callback
process.", ex);
+ try {
+
response.sendRedirect("/dolphinscheduler/ui/#/login?error=oidc_critical_error");
+ } catch (IOException e) {
+ log.error("Failed to redirect to login page after a critical
error.", e);
+ }
+ }
+ }
+
+ @Operation(summary = "redirectToOidc", description =
"REDIRECT_TO_OIDC_LOGIN")
+ @GetMapping("/oauth2/authorization/{providerId}")
+ public void redirectToOidc(@PathVariable String providerId,
HttpServletRequest request,
+ HttpServletResponse response) throws
IOException {
+ String state = providerId + ":" + UUID.randomUUID().toString();
+ request.getSession().setAttribute(Constants.SSO_LOGIN_USER_STATE,
state);
Review Comment:
## Trust boundary violation
This servlet reads data from a [remote source](1) and writes it to a session
variable.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5472)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoginController.java:
##########
@@ -263,4 +302,77 @@
"oauth2", "oauth2 auth error"));
}
}
+
+ /**
+ * Handle OIDC callback
+ *
+ * @param code authorization code
+ * @param state state parameter
+ * @param providerId OIDC provider ID
+ * @param request HTTP request
+ * @param response HTTP response
+ */
+ @SneakyThrows
+ @Operation(summary = "handleOidcCallback", description =
"HANDLE_OIDC_CALLBACK")
+ @GetMapping("login/oauth2/code/{providerId}")
+ public void handleOidcCallback(@RequestParam(name = "code", required =
false) String code,
+ @RequestParam(name = "error", required =
false) String error,
+ @RequestParam(name = "state") String state,
+ @PathVariable String providerId,
Review Comment:
## Useless parameter
The parameter 'providerId' is never used.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5478)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/oidc/OidcAuthenticator.java:
##########
@@ -0,0 +1,356 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.api.security.impl.oidc;
+
+import org.apache.dolphinscheduler.api.security.impl.AbstractSsoAuthenticator;
+import org.apache.dolphinscheduler.api.service.UsersService;
+import org.apache.dolphinscheduler.common.constants.Constants;
+import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.dao.entity.User;
+
+import java.net.URI;
+import java.security.MessageDigest;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.servlet.http.HttpServletRequest;
+
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.nimbusds.jwt.JWT;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.oauth2.sdk.AuthorizationCode;
+import com.nimbusds.oauth2.sdk.AuthorizationCodeGrant;
+import com.nimbusds.oauth2.sdk.ResponseType;
+import com.nimbusds.oauth2.sdk.Scope;
+import com.nimbusds.oauth2.sdk.TokenRequest;
+import com.nimbusds.oauth2.sdk.TokenResponse;
+import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretPost;
+import com.nimbusds.oauth2.sdk.auth.Secret;
+import com.nimbusds.oauth2.sdk.http.HTTPResponse;
+import com.nimbusds.oauth2.sdk.id.ClientID;
+import com.nimbusds.oauth2.sdk.id.State;
+import com.nimbusds.oauth2.sdk.token.AccessToken;
+import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
+import com.nimbusds.openid.connect.sdk.Nonce;
+import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
+import com.nimbusds.openid.connect.sdk.OIDCTokenResponseParser;
+import com.nimbusds.openid.connect.sdk.UserInfoRequest;
+import com.nimbusds.openid.connect.sdk.UserInfoResponse;
+import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet;
+import com.nimbusds.openid.connect.sdk.claims.UserInfo;
+import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
+import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
+
+@Slf4j
+@Component("oidcAuthenticator")
+public class OidcAuthenticator extends AbstractSsoAuthenticator {
+
+ @Autowired
+ private OidcConfigProperties oidcConfig;
+
+ @Autowired
+ private UsersService usersService;
+
+ @Value("${api.base-url:http://localhost:12345/dolphinscheduler}";)
+ private String apiBaseUrl;
+
+ private final Map<String, OIDCProviderMetadata> providerMetadataCache =
new ConcurrentHashMap<>();
+
+ @Override
+ public User login(@NonNull String state, String code) {
+
+ try {
+ ServletRequestAttributes servletRequestAttributes =
+ (ServletRequestAttributes)
RequestContextHolder.getRequestAttributes();
+ if (servletRequestAttributes == null) {
+ log.error("ServletRequestAttributes is null, cannot get
session");
+ return null;
+ }
+
+ HttpServletRequest request = servletRequestAttributes.getRequest();
+ String originalState = (String)
request.getSession().getAttribute(Constants.SSO_LOGIN_USER_STATE);
+
request.getSession().removeAttribute(Constants.SSO_LOGIN_USER_STATE);
+
+ if (originalState == null ||
!MessageDigest.isEqual(originalState.getBytes(), state.getBytes())) {
+ log.error("State validation failed. Expected: {}, Actual: {}",
originalState, state);
+ return null;
+ }
+
+ String[] stateParts = state.split(":", 2);
+ if (stateParts.length != 2) {
+ log.error("Invalid state format: {}", state);
Review Comment:
## Log Injection
This log entry depends on a [user-provided value](1).
This log entry depends on a [user-provided value](2).
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5475)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/oidc/OidcAuthenticator.java:
##########
@@ -0,0 +1,356 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.api.security.impl.oidc;
+
+import org.apache.dolphinscheduler.api.security.impl.AbstractSsoAuthenticator;
+import org.apache.dolphinscheduler.api.service.UsersService;
+import org.apache.dolphinscheduler.common.constants.Constants;
+import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.dao.entity.User;
+
+import java.net.URI;
+import java.security.MessageDigest;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.servlet.http.HttpServletRequest;
+
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.nimbusds.jwt.JWT;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.oauth2.sdk.AuthorizationCode;
+import com.nimbusds.oauth2.sdk.AuthorizationCodeGrant;
+import com.nimbusds.oauth2.sdk.ResponseType;
+import com.nimbusds.oauth2.sdk.Scope;
+import com.nimbusds.oauth2.sdk.TokenRequest;
+import com.nimbusds.oauth2.sdk.TokenResponse;
+import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretPost;
+import com.nimbusds.oauth2.sdk.auth.Secret;
+import com.nimbusds.oauth2.sdk.http.HTTPResponse;
+import com.nimbusds.oauth2.sdk.id.ClientID;
+import com.nimbusds.oauth2.sdk.id.State;
+import com.nimbusds.oauth2.sdk.token.AccessToken;
+import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
+import com.nimbusds.openid.connect.sdk.Nonce;
+import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
+import com.nimbusds.openid.connect.sdk.OIDCTokenResponseParser;
+import com.nimbusds.openid.connect.sdk.UserInfoRequest;
+import com.nimbusds.openid.connect.sdk.UserInfoResponse;
+import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet;
+import com.nimbusds.openid.connect.sdk.claims.UserInfo;
+import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
+import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
+
+@Slf4j
+@Component("oidcAuthenticator")
+public class OidcAuthenticator extends AbstractSsoAuthenticator {
+
+ @Autowired
+ private OidcConfigProperties oidcConfig;
+
+ @Autowired
+ private UsersService usersService;
+
+ @Value("${api.base-url:http://localhost:12345/dolphinscheduler}";)
+ private String apiBaseUrl;
+
+ private final Map<String, OIDCProviderMetadata> providerMetadataCache =
new ConcurrentHashMap<>();
+
+ @Override
+ public User login(@NonNull String state, String code) {
+
+ try {
+ ServletRequestAttributes servletRequestAttributes =
+ (ServletRequestAttributes)
RequestContextHolder.getRequestAttributes();
+ if (servletRequestAttributes == null) {
+ log.error("ServletRequestAttributes is null, cannot get
session");
+ return null;
+ }
+
+ HttpServletRequest request = servletRequestAttributes.getRequest();
+ String originalState = (String)
request.getSession().getAttribute(Constants.SSO_LOGIN_USER_STATE);
+
request.getSession().removeAttribute(Constants.SSO_LOGIN_USER_STATE);
+
+ if (originalState == null ||
!MessageDigest.isEqual(originalState.getBytes(), state.getBytes())) {
+ log.error("State validation failed. Expected: {}, Actual: {}",
originalState, state);
+ return null;
+ }
+
+ String[] stateParts = state.split(":", 2);
+ if (stateParts.length != 2) {
+ log.error("Invalid state format: {}", state);
+ return null;
+ }
+
+ String providerId = stateParts[0];
+ OidcProviderConfig providerConfig =
oidcConfig.getProviders().get(providerId);
+ if (providerConfig == null) {
+ log.error("Provider not found: {}", providerId);
Review Comment:
## Log Injection
This log entry depends on a [user-provided value](1).
This log entry depends on a [user-provided value](2).
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5476)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoginController.java:
##########
@@ -263,4 +302,77 @@
"oauth2", "oauth2 auth error"));
}
}
+
+ /**
+ * Handle OIDC callback
+ *
+ * @param code authorization code
+ * @param state state parameter
+ * @param providerId OIDC provider ID
+ * @param request HTTP request
+ * @param response HTTP response
+ */
+ @SneakyThrows
+ @Operation(summary = "handleOidcCallback", description =
"HANDLE_OIDC_CALLBACK")
+ @GetMapping("login/oauth2/code/{providerId}")
+ public void handleOidcCallback(@RequestParam(name = "code", required =
false) String code,
+ @RequestParam(name = "error", required =
false) String error,
+ @RequestParam(name = "state") String state,
+ @PathVariable String providerId,
+ HttpServletRequest request,
Review Comment:
## Useless parameter
The parameter 'request' is never used.
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5479)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoginController.java:
##########
@@ -263,4 +302,77 @@
"oauth2", "oauth2 auth error"));
}
}
+
+ /**
+ * Handle OIDC callback
+ *
+ * @param code authorization code
+ * @param state state parameter
+ * @param providerId OIDC provider ID
+ * @param request HTTP request
+ * @param response HTTP response
+ */
+ @SneakyThrows
+ @Operation(summary = "handleOidcCallback", description =
"HANDLE_OIDC_CALLBACK")
+ @GetMapping("login/oauth2/code/{providerId}")
+ public void handleOidcCallback(@RequestParam(name = "code", required =
false) String code,
+ @RequestParam(name = "error", required =
false) String error,
+ @RequestParam(name = "state") String state,
+ @PathVariable String providerId,
+ HttpServletRequest request,
+ HttpServletResponse response) throws
IOException {
+
+ // Handle login failure from OIDC provider
+ if (error != null) {
+ log.error("OIDC login failed with error: {}.", error);
Review Comment:
## Log Injection
This log entry depends on a [user-provided value](1).
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5473)
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/oidc/OidcAuthenticator.java:
##########
@@ -0,0 +1,356 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.api.security.impl.oidc;
+
+import org.apache.dolphinscheduler.api.security.impl.AbstractSsoAuthenticator;
+import org.apache.dolphinscheduler.api.service.UsersService;
+import org.apache.dolphinscheduler.common.constants.Constants;
+import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.dao.entity.User;
+
+import java.net.URI;
+import java.security.MessageDigest;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.servlet.http.HttpServletRequest;
+
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.nimbusds.jwt.JWT;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.oauth2.sdk.AuthorizationCode;
+import com.nimbusds.oauth2.sdk.AuthorizationCodeGrant;
+import com.nimbusds.oauth2.sdk.ResponseType;
+import com.nimbusds.oauth2.sdk.Scope;
+import com.nimbusds.oauth2.sdk.TokenRequest;
+import com.nimbusds.oauth2.sdk.TokenResponse;
+import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretPost;
+import com.nimbusds.oauth2.sdk.auth.Secret;
+import com.nimbusds.oauth2.sdk.http.HTTPResponse;
+import com.nimbusds.oauth2.sdk.id.ClientID;
+import com.nimbusds.oauth2.sdk.id.State;
+import com.nimbusds.oauth2.sdk.token.AccessToken;
+import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
+import com.nimbusds.openid.connect.sdk.Nonce;
+import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
+import com.nimbusds.openid.connect.sdk.OIDCTokenResponseParser;
+import com.nimbusds.openid.connect.sdk.UserInfoRequest;
+import com.nimbusds.openid.connect.sdk.UserInfoResponse;
+import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet;
+import com.nimbusds.openid.connect.sdk.claims.UserInfo;
+import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
+import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
+
+@Slf4j
+@Component("oidcAuthenticator")
+public class OidcAuthenticator extends AbstractSsoAuthenticator {
+
+ @Autowired
+ private OidcConfigProperties oidcConfig;
+
+ @Autowired
+ private UsersService usersService;
+
+ @Value("${api.base-url:http://localhost:12345/dolphinscheduler}";)
+ private String apiBaseUrl;
+
+ private final Map<String, OIDCProviderMetadata> providerMetadataCache =
new ConcurrentHashMap<>();
+
+ @Override
+ public User login(@NonNull String state, String code) {
+
+ try {
+ ServletRequestAttributes servletRequestAttributes =
+ (ServletRequestAttributes)
RequestContextHolder.getRequestAttributes();
+ if (servletRequestAttributes == null) {
+ log.error("ServletRequestAttributes is null, cannot get
session");
+ return null;
+ }
+
+ HttpServletRequest request = servletRequestAttributes.getRequest();
+ String originalState = (String)
request.getSession().getAttribute(Constants.SSO_LOGIN_USER_STATE);
+
request.getSession().removeAttribute(Constants.SSO_LOGIN_USER_STATE);
+
+ if (originalState == null ||
!MessageDigest.isEqual(originalState.getBytes(), state.getBytes())) {
+ log.error("State validation failed. Expected: {}, Actual: {}",
originalState, state);
Review Comment:
## Log Injection
This log entry depends on a [user-provided value](1).
This log entry depends on a [user-provided value](2).
[Show more
details](https://github.com/apache/dolphinscheduler/security/code-scanning/5474)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
