The Unified and Autonomous Development Platform
Fix issue #1065 - Able to specify openid configuration discovery url
Robin Shen12b6c91e9785
diff --git a/pom.xml b/pom.xmlindex 0848b82acd..62b4a2abad 100644--- a/pom.xml+++ b/pom.xml@@ -620,7 +620,7 @@</repositories><properties><commons.version>2.7.3</commons.version>- <agent.version>1.7.14</agent.version>+ <agent.version>1.7.15</agent.version><slf4j.version>1.7.36</slf4j.version><logback.version>1.2.11</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/ServerSocket.java b/server-core/src/main/java/io/onedev/server/ServerSocket.javaindex 2841fa5f4d..589e925b46 100644--- a/server-core/src/main/java/io/onedev/server/ServerSocket.java+++ b/server-core/src/main/java/io/onedev/server/ServerSocket.java@@ -5,6 +5,7 @@ import java.io.Serializable;import java.nio.charset.StandardCharsets;import java.util.concurrent.ExecutorService;+import io.onedev.agent.*;import org.apache.commons.lang3.SerializationUtils;import org.eclipse.jetty.websocket.api.Session;import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;@@ -15,12 +16,6 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.agent.AgentData;-import io.onedev.agent.CallData;-import io.onedev.agent.Message;-import io.onedev.agent.MessageTypes;-import io.onedev.agent.WantToDisconnectAgent;-import io.onedev.agent.WebsocketUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TaskLogger;@@ -188,7 +183,7 @@ public class ServerSocket {private Serializable service(Serializable request) {try {- if (request instanceof WantToDisconnectAgent) {+ if (request instanceof WantToDisconnectAgent || request instanceof WaitingForAgentResourceToBeReleased) {if (agentId != null)OneDev.getInstance(ResourceAllocator.class).wantToDisconnectAgent(agentId);return null;diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 02f7c587b4..117b8a56a0 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -4569,7 +4569,7 @@ public class DataMigrator {var gitConfigElement = valueElement.element("gitConfig");gitConfigElement.setName("gitLocation");var clazz = gitConfigElement.attributeValue("class").replace(- "io.onedev.server.git.config.",+ "io.onedev.server.git.config.","io.onedev.server.git.location.");gitConfigElement.addAttribute("class", clazz);@@ -4580,6 +4580,17 @@ public class DataMigrator {"io.onedev.server.git.location.");curlConfigElement.addAttribute("class", clazz);}+ } else if (key.equals("SSO_CONNECTORS")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (Element connectorElement: valueElement.elements()) {+ if (connectorElement.getName().contains("OpenIdConnector")) {+ Element issuerUrlElement = connectorElement.element("issuerUrl");+ issuerUrlElement.setName("configurationDiscoveryUrl");+ issuerUrlElement.setText(issuerUrlElement.getText().trim() + "/.well-known/openid-configuration");+ }+ }+ }} else if (key.equals("PERFORMANCE")) {Element valueElement = element.element("value");if (valueElement != null) {@@ -4594,7 +4605,6 @@ public class DataMigrator {.setText(String.valueOf(cpuIntensiveTaskConcurrency));}}-}dom.writeToFile(file, false);} else if (file.getName().startsWith("Projects.xml")) {diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.javaindex aa7070c84f..35441dcba9 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/GitHubConnector.java@@ -33,8 +33,8 @@ public class GitHubConnector extends OpenIdConnector {}@Override- public String getIssuerUrl() {- return super.getIssuerUrl();+ public String getConfigurationDiscoveryUrl() {+ return super.getConfigurationDiscoveryUrl();}@Overridediff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.javaindex fea7ebfcc3..e28d6402ea 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java@@ -1,38 +1,11 @@package io.onedev.server.plugin.sso.openid;-import java.io.IOException;-import java.net.URI;-import java.net.URISyntaxException;-import java.util.ArrayList;-import java.util.List;-import java.util.UUID;--import javax.annotation.Nullable;-import javax.servlet.http.HttpServletRequest;--import org.apache.shiro.authc.AuthenticationException;-import org.apache.wicket.Session;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.flow.RedirectToUrlException;-import javax.validation.constraints.NotEmpty;-import org.joda.time.DateTime;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.nimbusds.common.contenttype.ContentType;import com.nimbusds.jwt.JWT;import com.nimbusds.jwt.JWTClaimsSet;-import com.nimbusds.oauth2.sdk.AuthorizationCodeGrant;-import com.nimbusds.oauth2.sdk.AuthorizationGrant;-import com.nimbusds.oauth2.sdk.ErrorObject;-import com.nimbusds.oauth2.sdk.ParseException;-import com.nimbusds.oauth2.sdk.ResponseType;-import com.nimbusds.oauth2.sdk.Scope;-import com.nimbusds.oauth2.sdk.SerializeException;-import com.nimbusds.oauth2.sdk.TokenRequest;-import com.nimbusds.oauth2.sdk.TokenResponse;+import com.nimbusds.oauth2.sdk.*;import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;import com.nimbusds.oauth2.sdk.auth.Secret;@@ -41,17 +14,7 @@ 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.BearerAccessToken;-import com.nimbusds.openid.connect.sdk.AuthenticationErrorResponse;-import com.nimbusds.openid.connect.sdk.AuthenticationRequest;-import com.nimbusds.openid.connect.sdk.AuthenticationResponse;-import com.nimbusds.openid.connect.sdk.AuthenticationResponseParser;-import com.nimbusds.openid.connect.sdk.AuthenticationSuccessResponse;-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.UserInfoErrorResponse;-import com.nimbusds.openid.connect.sdk.UserInfoRequest;-+import com.nimbusds.openid.connect.sdk.*;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;@@ -65,6 +28,23 @@ import io.onedev.server.web.editable.annotation.Password;import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;import net.minidev.json.JSONArray;import net.minidev.json.JSONObject;+import org.apache.shiro.authc.AuthenticationException;+import org.apache.wicket.Session;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.flow.RedirectToUrlException;+import org.joda.time.DateTime;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.servlet.http.HttpServletRequest;+import javax.validation.constraints.NotEmpty;+import java.io.IOException;+import java.net.URI;+import java.net.URISyntaxException;+import java.util.ArrayList;+import java.util.List;+import java.util.UUID;@Editable(name="OpenID", order=10000, description="Refer to this <a href='https://docs.onedev.io/tutorials/security/sso-with-okta/' target='_blank'>tutorial</a> for an example setup")public class OpenIdConnector extends SsoConnector {@@ -81,7 +61,7 @@ public class OpenIdConnector extends SsoConnector {private String clientSecret;- private String issuerUrl;+ private String configurationDiscoveryUrl;private String groupsClaim;@@ -109,17 +89,17 @@ public class OpenIdConnector extends SsoConnector {super.setName(name);}- @Editable(order=200, description="Specify issuer url of your OpenID provider. OpenID endpoints "- + "discovery url will be constructed from this by appending <i>/.well-known/openid-configuration</i>. "- + "Make sure to use HTTPS protocol as OneDev relies on TLS encryption to ensure "- + "token validity")+ @Editable(order=200, description="Specify configuration discovery url of your OpenID provider, " ++ "for instance: <code>https://openid.example.com/.well-known/openid-configuration</code>. " ++ "Make sure to use HTTPS protocol as OneDev relies on TLS encryption to ensure token " ++ "validity")@NotEmpty- public String getIssuerUrl() {- return issuerUrl;+ public String getConfigurationDiscoveryUrl() {+ return configurationDiscoveryUrl;}- public void setIssuerUrl(String issuerUrl) {- this.issuerUrl = issuerUrl;+ public void setConfigurationDiscoveryUrl(String configurationDiscoveryUrl) {+ this.configurationDiscoveryUrl = configurationDiscoveryUrl;}@Editable(order=1000, description="OpenID client identification will be assigned by your OpenID "@@ -311,7 +291,7 @@ public class OpenIdConnector extends SsoConnector {protected ProviderMetadata discoverProviderMetadata() {try {JsonNode json = OneDev.getInstance(ObjectMapper.class).readTree(- new URI(getIssuerUrl() + "/.well-known/openid-configuration").toURL());+ new URI(getConfigurationDiscoveryUrl()).toURL());return new ProviderMetadata(json.get("issuer").asText(),json.get("authorization_endpoint").asText(),