The Unified and Autonomous Development Platform
fix: Login page can not display default icon of OpenId SSO (OD-2304)
Robin Shen51d67c6369ab
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 1c3023c43f..a95ffbece7 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -7632,4 +7632,30 @@ public class DataMigrator {}}+ private void migrate191(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ var dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("SSO_CONNECTORS")) {+ var valueElement = element.element("value");+ if (valueElement != null) {+ for (Element connectorElement : valueElement.elements()) {+ var buttonImageUrlElement = connectorElement.element("buttonImageUrl");+ if (buttonImageUrlElement != null) {+ var buttonImageUrl = buttonImageUrlElement.getText().trim();+ if (buttonImageUrl.startsWith("/wicket/resource/io.onedev.server.plugin.sso.openid.openidconnector")) {+ buttonImageUrl = "/wicket/resource/io.onedev.server.plugin.sso.openid.OpenIdConnector/openid.png";+ buttonImageUrlElement.setText(buttonImageUrl);+ }+ }+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }+}\ No newline at end of filediff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.javaindex 903c1bf415..090da14b0f 100644--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java@@ -1,5 +1,20 @@package io.onedev.server.plugin.sso.discord;+import java.io.IOException;+import java.net.URI;+import java.net.URISyntaxException;++import javax.servlet.http.HttpServletRequest;+import javax.validation.constraints.NotEmpty;++import org.apache.commons.lang3.StringUtils;+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.json.JSONException;+import org.json.JSONObject;+import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Password;@@ -11,22 +26,6 @@ import io.onedev.server.plugin.sso.discord.oauth2.Request;import io.onedev.server.plugin.sso.discord.oauth2.UserGuildsResponse;import io.onedev.server.plugin.sso.discord.oauth2.UserInfoResponse;import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;-import org.apache.commons.lang3.StringUtils;-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.json.JSONException;-import org.json.JSONObject;--import javax.servlet.http.HttpServletRequest;-import javax.validation.constraints.NotEmpty;-import java.io.IOException;-import java.net.URI;-import java.net.URISyntaxException;@Editable(name="Discord", order=150, description="Single sign on via discord.com")public class DiscordConnector extends SsoConnector {@@ -74,8 +73,7 @@ public class DiscordConnector extends SsoConnector {@Overridepublic String getButtonImageUrl() {- ResourceReference logo = new PackageResourceReference(DiscordConnector.class, "discord.png");- return RequestCycle.get().urlFor(logo, new PageParameters()).toString();+ return "/wicket/resource/" + DiscordConnector.class.getName() + "/discord.png";}@Overridediff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.javaindex 2a90af43f0..6fbd6fd0b9 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/EntraIdConnector.java@@ -1,29 +1,28 @@package io.onedev.server.plugin.sso.openid;+import java.io.IOException;+import java.net.URI;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;++import javax.validation.constraints.NotEmpty;+import javax.ws.rs.core.MediaType;++import org.apache.shiro.authc.AuthenticationException;+import com.fasterxml.jackson.databind.ObjectMapper;import com.nimbusds.oauth2.sdk.ParseException;import com.nimbusds.oauth2.sdk.http.HTTPRequest;import com.nimbusds.oauth2.sdk.http.HTTPResponse;import com.nimbusds.oauth2.sdk.token.BearerAccessToken;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Password;import net.minidev.json.JSONArray;import net.minidev.json.JSONObject;-import org.apache.shiro.authc.AuthenticationException;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.PackageResourceReference;-import org.apache.wicket.request.resource.ResourceReference;--import javax.validation.constraints.NotEmpty;-import javax.ws.rs.core.MediaType;-import java.io.IOException;-import java.net.URI;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;@Editable(name="Microsoft Entra ID", order=125)public class EntraIdConnector extends OpenIdConnector {@@ -101,8 +100,7 @@ public class EntraIdConnector extends OpenIdConnector {@Overridepublic String getButtonImageUrl() {- ResourceReference logo = new PackageResourceReference(GitHubConnector.class, "entraid.png");- return RequestCycle.get().urlFor(logo, new PageParameters()).toString();+ return "/wicket/resource/" + EntraIdConnector.class.getName() + "/entraid.png";}@Overridediff --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 d91544b98d..b7f456f61f 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@@ -1,5 +1,12 @@package io.onedev.server.plugin.sso.openid;+import java.io.IOException;+import java.net.URI;+import java.net.URISyntaxException;++import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authc.AuthenticationException;+import com.nimbusds.oauth2.sdk.ParseException;import com.nimbusds.oauth2.sdk.SerializeException;import com.nimbusds.oauth2.sdk.http.HTTPResponse;@@ -7,19 +14,10 @@ import com.nimbusds.oauth2.sdk.token.BearerAccessToken;import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;import com.nimbusds.openid.connect.sdk.UserInfoErrorResponse;import com.nimbusds.openid.connect.sdk.UserInfoRequest;+import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.administration.sso.SsoAuthenticated;import net.minidev.json.JSONObject;-import org.apache.commons.lang3.StringUtils;-import org.apache.shiro.authc.AuthenticationException;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.PackageResourceReference;-import org.apache.wicket.request.resource.ResourceReference;--import java.io.IOException;-import java.net.URI;-import java.net.URISyntaxException;@Editable(name="GitHub", order=100, description="Refer to this <a href='https://docs.onedev.io/tutorials/security/sso-with-github' target='_blank'>tutorial</a> for an example setup")public class GitHubConnector extends OpenIdConnector {@@ -46,8 +44,7 @@ public class GitHubConnector extends OpenIdConnector {@Overridepublic String getButtonImageUrl() {- ResourceReference logo = new PackageResourceReference(GitHubConnector.class, "octocat.png");- return RequestCycle.get().urlFor(logo, new PageParameters()).toString();+ return "/wicket/resource/" + GitHubConnector.class.getName() + "/octocat.png";}@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 d277531c94..b1f2ff1c7c 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@@ -15,9 +15,6 @@ 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;@@ -92,6 +89,10 @@ public class OpenIdConnector extends SsoConnector {private String buttonImageUrl;+ public OpenIdConnector() {+ buttonImageUrl = "/wicket/resource/" + OpenIdConnector.class.getName() + "/openid.png";+ }+@Editable(order=100, description="Name of the provider will serve two purpose: "+ "<ul>"+ "<li>Display on login button"@@ -345,10 +346,6 @@ 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;}diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.javaindex 79827f5c95..6d4d670c79 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/TwitchConnector.java@@ -42,6 +42,11 @@ public class TwitchConnector extends OpenIdConnector {"https://id.twitch.tv/oauth2/userinfo");}+ @Override+ public String getButtonImageUrl() {+ return "/wicket/resource/" + TwitchConnector.class.getName() + "/twitch.png";+ }+@Overridepublic String getGroupsClaim() {return super.getGroupsClaim();diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/twitch.png b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/twitch.pngnew file mode 100644index 0000000000..2af84437baBinary files /dev/null and b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/twitch.png differ