The Unified and Autonomous Development Platform
fix issue #22: Unable to download private artifacts with wget/curl even if user name and password is provided
Robin Shen9afc3d46f668
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex e67af3e1ca..d109076771 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -322,7 +322,7 @@ public class CoreModule extends AbstractPluginModule {configurePersistence();configureRestServices();configureWeb();- configureCI();+ configureBuild();bind(GitConfig.class).toProvider(GitConfigProvider.class);@@ -611,7 +611,7 @@ public class CoreModule extends AbstractPluginModule {});}- private void configureCI() {+ private void configureBuild() {contribute(ScriptContribution.class, new ScriptContribution() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java b/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.javaindex 3466c0af05..1029005822 100644--- a/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java+++ b/server-core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java@@ -3,7 +3,6 @@ package io.onedev.server.security;import java.io.IOException;import java.util.Locale;-import javax.inject.Inject;import javax.inject.Singleton;import javax.servlet.ServletException;import javax.servlet.ServletRequest;@@ -12,46 +11,26 @@ import javax.servlet.http.HttpServletRequest;import javax.servlet.http.HttpServletResponse;import org.apache.shiro.SecurityUtils;-import org.apache.shiro.authc.IncorrectCredentialsException;-import org.apache.shiro.authc.UnknownAccountException;import org.apache.shiro.authc.UsernamePasswordToken;-import org.apache.shiro.authz.UnauthenticatedException;-import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.codec.Base64;import org.apache.shiro.subject.Subject;import org.apache.shiro.web.filter.PathMatchingFilter;import org.apache.shiro.web.util.WebUtils;-import io.onedev.commons.launcher.loader.PluginManager;-import io.onedev.commons.utils.ExceptionUtils;+import com.google.common.net.HttpHeaders;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.ExceptionUtils;@Singletonpublic class BasicAuthenticationFilter extends PathMatchingFilter {- /**- * HTTP Authorization header, equal to <code>Authorization</code>- */- protected static final String AUTHORIZATION_HEADER = "Authorization";-- /**- * HTTP Authentication header, equal to <code>WWW-Authenticate</code>- */- protected static final String AUTHENTICATE_HEADER = "WWW-Authenticate";-- private final String appName;-- @Inject- public BasicAuthenticationFilter(PluginManager pluginManager) {- appName = pluginManager.getProduct().getName();- }-@Overrideprotected boolean onPreHandle(ServletRequest request, ServletResponse response, Object mappedValue) throws Exception {Subject subject = SecurityUtils.getSubject();if (!subject.isAuthenticated()) {HttpServletRequest httpRequest = WebUtils.toHttp(request);- String authzHeader = httpRequest.getHeader(AUTHORIZATION_HEADER);+ String authzHeader = httpRequest.getHeader(HttpHeaders.AUTHORIZATION);if (authzHeader != null) {if (authzHeader.toLowerCase(Locale.ENGLISH).startsWith("basic")|| authzHeader.toLowerCase(Locale.ENGLISH).startsWith("token")) {@@ -75,29 +54,9 @@ public class BasicAuthenticationFilter extends PathMatchingFilter {throws ServletException, IOException {HttpServletResponse httpResponse = WebUtils.toHttp(response);- if (existing != null && !httpResponse.isCommitted()) {- if (ExceptionUtils.find(existing, UnauthenticatedException.class) != null) {- httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);- String authcHeader = HttpServletRequest.BASIC_AUTH + " realm=\"" + appName + "\"";- httpResponse.setHeader(AUTHENTICATE_HEADER, authcHeader);- existing = null;- } else if (ExceptionUtils.find(existing, UnauthorizedException.class) != null) {- if (!SecurityUtils.getSubject().isAuthenticated()) {- httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);- String authcHeader = HttpServletRequest.BASIC_AUTH + " realm=\"" + appName + "\"";- httpResponse.setHeader(AUTHENTICATE_HEADER, authcHeader);- existing = null;- } else {- httpResponse.sendError(HttpServletResponse.SC_FORBIDDEN, "Access denied.");- existing = null;- }- } else if (ExceptionUtils.find(existing, IncorrectCredentialsException.class) != null) {- httpResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Incorrect credentials.");- existing = null;- } else if (ExceptionUtils.find(existing, UnknownAccountException.class) != null) {- httpResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unknown user name.");- existing = null;- }+ if (existing != null && !httpResponse.isCommitted()) {+ ExceptionUtils.handle(httpResponse, existing);+ existing = null;}super.cleanup(request, response, existing);diff --git a/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java b/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.javanew file mode 100644index 0000000000..7bd7e2f5ed--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java@@ -0,0 +1,51 @@+package io.onedev.server.util;++import java.io.IOException;++import javax.servlet.http.HttpServletRequest;+import javax.servlet.http.HttpServletResponse;++import org.apache.shiro.SecurityUtils;+import org.apache.shiro.authc.IncorrectCredentialsException;+import org.apache.shiro.authc.UnknownAccountException;+import org.apache.shiro.authz.UnauthenticatedException;+import org.apache.shiro.authz.UnauthorizedException;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.net.HttpHeaders;++import io.onedev.server.OneDev;++public class ExceptionUtils extends io.onedev.commons.utils.ExceptionUtils {++ private static final Logger logger = LoggerFactory.getLogger(ExceptionUtils.class);++ public static void handle(HttpServletResponse response, Exception exception) {+ try {+ if (ExceptionUtils.find(exception, UnauthenticatedException.class) != null) {+ requireAuthentication(response);+ } else if (find(exception, UnauthorizedException.class) != null) {+ if (!SecurityUtils.getSubject().isAuthenticated())+ requireAuthentication(response);+ else+ response.sendError(HttpServletResponse.SC_FORBIDDEN, "Access denied.");+ } else if (find(exception, IncorrectCredentialsException.class) != null) {+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Incorrect credentials.");+ } else if (find(exception, UnknownAccountException.class) != null) {+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unknown user name.");+ } else {+ logger.warn("Error serving request", exception);+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, exception.getMessage());+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ private static void requireAuthentication(HttpServletResponse response) {+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);+ String authcHeader = HttpServletRequest.BASIC_AUTH + " realm=\"" + OneDev.NAME + "\"";+ response.setHeader(HttpHeaders.WWW_AUTHENTICATE, authcHeader);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.javaindex e8adbb4991..761483f4c6 100644--- a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java@@ -45,6 +45,7 @@ import org.apache.wicket.request.Url;import org.apache.wicket.request.UrlRenderer;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.cycle.RequestCycleContext;+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.http.WebResponse;import org.apache.wicket.request.mapper.info.PageComponentInfo;@@ -214,17 +215,20 @@ public class OneWebApplication extends WebApplication {@Overrideprotected IRequestHandler mapExpectedExceptions(Exception e, Application application) {- boolean isAjax = ((WebRequest)RequestCycle.get().getRequest()).isAjax();- if (isAjax && (e instanceof ListenerInvocationNotAllowedException || e instanceof ComponentNotFoundException)) {+ RequestCycle requestCycle = RequestCycle.get();+ boolean isAjax = ((WebRequest)requestCycle.getRequest()).isAjax();+ if (isAjax && (e instanceof ListenerInvocationNotAllowedException || e instanceof ComponentNotFoundException))return EmptyAjaxRequestHandler.getInstance();- }- Page errorPage = mapExceptions(e);- if (errorPage != null) {- return createPageRequestHandler(new PageProvider(errorPage));- } else {- return super.mapExpectedExceptions(e, application);- }+ IRequestMapper mapper = Application.get().getRootRequestMapper();+ if (mapper.mapRequest(requestCycle.getRequest()) instanceof ResourceReferenceRequestHandler)+ return new ResourceErrorRequestHandler(e);++ HttpServletResponse response = (HttpServletResponse) requestCycle.getResponse().getContainerResponse();+ if (!response.isCommitted())+ return createPageRequestHandler(new PageProvider(new ErrorPage(e)));++ return super.mapExpectedExceptions(e, application);}};@@ -275,12 +279,4 @@ public class OneWebApplication extends WebApplication {return getRootRequestMapperAsCompound();}- protected Page mapExceptions(Exception e) {- HttpServletResponse response = (HttpServletResponse) RequestCycle.get().getResponse().getContainerResponse();- if (!response.isCommitted())- return new ErrorPage(e);- else- return null;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/ResourceErrorRequestHandler.java b/server-core/src/main/java/io/onedev/server/web/ResourceErrorRequestHandler.javanew file mode 100644index 0000000000..044a263eca--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/ResourceErrorRequestHandler.java@@ -0,0 +1,28 @@+package io.onedev.server.web;++import javax.servlet.http.HttpServletResponse;++import org.apache.wicket.request.IRequestCycle;+import org.apache.wicket.request.IRequestHandler;++import io.onedev.server.util.ExceptionUtils;++public final class ResourceErrorRequestHandler implements IRequestHandler {++ private final Exception exception;++ public ResourceErrorRequestHandler(Exception exception) {+ this.exception = exception;+ }++ @Override+ public void respond(IRequestCycle requestCycle) {+ HttpServletResponse response = (HttpServletResponse) requestCycle.getResponse().getContainerResponse();+ ExceptionUtils.handle(response, exception);+ }++ @Override+ public void detach(final IRequestCycle requestCycle) {+ }++}