The Unified and Autonomous Development Platform
fix: Unable to create SSO connector via REST API (OD-2303)
Robin Shen829d274da822
diff --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 8e934bc976..d277531c94 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,11 +1,41 @@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 javax.validation.constraints.NotEmpty;++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.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.request.resource.PackageResourceReference;+import org.apache.wicket.request.resource.ResourceReference;+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.*;+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.auth.ClientAuthentication;import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;import com.nimbusds.oauth2.sdk.http.HTTPRequest;@@ -13,7 +43,17 @@ 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.*;+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 io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;@@ -28,26 +68,6 @@ import io.onedev.server.util.oauth.OAuthUtils;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.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.PackageResourceReference;-import org.apache.wicket.request.resource.ResourceReference;-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 {@@ -72,11 +92,6 @@ public class OpenIdConnector extends SsoConnector {private String buttonImageUrl;- public OpenIdConnector() {- ResourceReference logo = new PackageResourceReference(OpenIdConnector.class, "openid.png");- buttonImageUrl = RequestCycle.get().urlFor(logo, new PageParameters()).toString();- }-@Editable(order=100, description="Name of the provider will serve two purpose: "+ "<ul>"+ "<li>Display on login button"@@ -330,6 +345,10 @@ public class OpenIdConnector extends SsoConnector {@NotEmpty@Overridepublic String getButtonImageUrl() {+ if (buttonImageUrl == null) {+ ResourceReference logo = new PackageResourceReference(OpenIdConnector.class, "openid.png");+ buttonImageUrl = RequestCycle.get().urlFor(logo, new PageParameters()).toString();+ }return buttonImageUrl;}