From 2968285d9a2158747bfc5fc2c93b8217bfff7702 Mon Sep 17 00:00:00 2001 From: kzantow Date: Fri, 25 Mar 2016 11:02:11 -0400 Subject: [PATCH 1/4] JENKINS-33770 - not all paths restricted during SetupWizard --- .../java/jenkins/install/SetupWizard.java | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java index 76ec95de54..d1668f3de2 100644 --- a/core/src/main/java/jenkins/install/SetupWizard.java +++ b/core/src/main/java/jenkins/install/SetupWizard.java @@ -6,6 +6,7 @@ import java.util.Locale; import java.util.Map; import java.util.UUID; import java.util.logging.Logger; +import java.util.regex.Pattern; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -23,6 +24,7 @@ import org.kohsuke.stapler.StaplerResponse; import hudson.BulkChange; import hudson.FilePath; +import hudson.model.User; import hudson.security.FullControlOnceLoggedInAuthorizationStrategy; import hudson.security.HudsonPrivateSecurityRealm; import hudson.security.SecurityRealm; @@ -54,6 +56,7 @@ import java.util.logging.Logger; * * @since 2.0 */ +@Restricted(NoExternalUse.class) // use by Jelly public class SetupWizard { /** * The security token parameter name @@ -135,7 +138,6 @@ public class SetupWizard { /** * Gets the file used to store the initial admin password */ - @Restricted(NoExternalUse.class) // use by Jelly public FilePath getInitialAdminPasswordFile() { return jenkins.getRootPath().child("secrets/initialAdminPassword"); } @@ -161,6 +163,11 @@ public class SetupWizard { * This filter will validate that the security token is provided */ private final Filter FORCE_SETUP_WIZARD_FILTER = new Filter() { + private Pattern RESOURCE_PATTERN = Pattern.compile(".*[.](css|ttf|gif|woff|eot|png|js)"); + private Pattern ALLOWED_PATHS = Pattern.compile( + "\\Q/login\\E" + + "|\\Q/loginError\\E" + + "|\\Q/securityRealm/" + new HudsonPrivateSecurityRealm(true, false, null).getAuthenticationGatewayUrl() + "\\E"); @Override public void init(FilterConfig cfg) throws ServletException { } @@ -172,15 +179,24 @@ public class SetupWizard { // we'll set a cookie so the subsequent operations succeed if (request instanceof HttpServletRequest) { HttpServletRequest req = (HttpServletRequest)request; - //if (!Pattern.compile(".*[.](css|ttf|gif|woff|eot|png|js)").matcher(req.getRequestURI()).matches()) { - // Allow js & css requests through - if((req.getContextPath() + "/").equals(req.getRequestURI())) { + // Allow js & css requests through + if (!RESOURCE_PATTERN.matcher(req.getRequestURI()).matches()) { // allow resources + boolean isAdmin = jenkins.getACL().hasPermission(Jenkins.ADMINISTER); + final String adjustedPath = req.getRequestURI().substring(req.getContextPath().length()); + final String destination; + // if the user hasn't authenticated, don't allow anything other than the login submit and error page + if (!isAdmin && !ALLOWED_PATHS.matcher(adjustedPath).matches()) { + destination = req.getContextPath() + "/login"; + } else if (isAdmin && "/".equals(adjustedPath)) { + destination = req.getContextPath() + "/setupWizard/"; + } else { + destination = req.getRequestURI(); + } chain.doFilter(new HttpServletRequestWrapper(req) { public String getRequestURI() { - return getContextPath() + "/setupWizard/"; + return destination; } }, response); - return; } // fall through to handling the request normally } From 3cf8de04a9fae00dabcec4c3888903afda4336df Mon Sep 17 00:00:00 2001 From: kzantow Date: Mon, 28 Mar 2016 13:55:29 -0400 Subject: [PATCH 2/4] JENKINS-33770 - fix issue directly submitting firstUser page --- .../security/HudsonPrivateSecurityRealm.java | 49 ++++------ .../java/jenkins/install/SetupWizard.java | 90 ++++++++++--------- .../SetupWizard}/setupWizardFirstUser.jelly | 4 +- war/src/main/js/api/securityConfig.js | 2 +- war/src/main/js/templates/firstUserPanel.hbs | 2 +- 5 files changed, 68 insertions(+), 79 deletions(-) rename core/src/main/resources/{hudson/security/HudsonPrivateSecurityRealm => jenkins/install/SetupWizard}/setupWizardFirstUser.jelly (83%) diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java index 3d2e447527..4e41fa8f55 100644 --- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java +++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java @@ -29,8 +29,6 @@ import hudson.ExtensionList; import hudson.Util; import hudson.diagnosis.OldDataMonitor; import hudson.model.Descriptor; -import jenkins.install.InstallState; -import jenkins.install.SetupWizard; import jenkins.model.Jenkins; import hudson.model.ManagementLink; import hudson.model.ModelObject; @@ -261,16 +259,25 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea } /** - * Creates an user account. Used by admins. + * Creates a user account. Used by admins. * * This version behaves differently from {@link #doCreateAccount(StaplerRequest, StaplerResponse)} in that * this is someone creating another user. */ public void doCreateAccountByAdmin(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { + createAccountByAdmin(req, rsp, "addUser.jelly", "."); // send the user back to the listing page on success + } + + /** + * Creates a user account. Requires {@link Jenkins#ADMINISTER} + */ + public User createAccountByAdmin(StaplerRequest req, StaplerResponse rsp, String addUserView, String successView) throws IOException, ServletException { checkPermission(Jenkins.ADMINISTER); - if(createAccount(req, rsp, false, "addUser.jelly")!=null) { - rsp.sendRedirect("."); // send the user back to the listing page + User u = createAccount(req, rsp, false, addUserView); + if(u != null) { + rsp.sendRedirect(successView); } + return u; } /** @@ -280,36 +287,14 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea * This can be run by anyone, but only to create the very first user account. */ public void doCreateFirstAccount(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { - boolean inSetup = !Jenkins.getInstance().getInstallState().isSetupComplete(); - if(!inSetup && hasSomeUser()) { + if(hasSomeUser()) { rsp.sendError(SC_UNAUTHORIZED,"First user was already created"); return; } - - User admin = null; - try { - String view = "firstUser.jelly"; - if(inSetup) { - admin = getUser(SetupWizard.initialSetupAdminUserName); - if(admin != null) { - admin.delete(); // assume the new user may well be 'admin' - } - view = "setupWizardFirstUser.jelly"; - } - - User u = createAccount(req, rsp, false, view); - if (u!=null) { - tryToMakeAdmin(u); - if(admin != null) { - admin = null; - } - Jenkins.getInstance().setInstallState(InstallState.CREATE_ADMIN_USER.getNextState()); - loginAndTakeBack(req, rsp, u); - } - } finally { - if(admin != null) { - admin.save(); // recreate this initial user if something failed - } + User u = createAccount(req, rsp, false, "firstUser.jelly"); + if (u!=null) { + tryToMakeAdmin(u); + loginAndTakeBack(req, rsp, u); } } diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java index d1668f3de2..c0a797e25a 100644 --- a/core/src/main/java/jenkins/install/SetupWizard.java +++ b/core/src/main/java/jenkins/install/SetupWizard.java @@ -1,12 +1,9 @@ package jenkins.install; import java.io.IOException; -import java.util.Iterator; import java.util.Locale; -import java.util.Map; import java.util.UUID; import java.util.logging.Logger; -import java.util.regex.Pattern; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -17,7 +14,11 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import hudson.util.VersionNumber; +import org.acegisecurity.Authentication; +import org.acegisecurity.context.SecurityContextHolder; +import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -31,24 +32,9 @@ import hudson.security.SecurityRealm; import hudson.security.csrf.DefaultCrumbIssuer; import hudson.util.HttpResponses; import hudson.util.PluginServletFilter; +import hudson.util.VersionNumber; import jenkins.model.Jenkins; import jenkins.security.s2m.AdminWhitelistRule; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; -import org.kohsuke.stapler.HttpResponse; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import java.io.IOException; -import java.util.Locale; -import java.util.UUID; -import java.util.logging.Logger; /** * A Jenkins instance used during first-run to provide a limited set of services while @@ -56,7 +42,7 @@ import java.util.logging.Logger; * * @since 2.0 */ -@Restricted(NoExternalUse.class) // use by Jelly +@Restricted(NoExternalUse.class) public class SetupWizard { /** * The security token parameter name @@ -134,6 +120,42 @@ public class SetupWizard { throw new AssertionError(e); } } + + /** + * Called during the initial setup to create an admin user + */ + public void doCreateAdminUser(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { + Jenkins j = Jenkins.getInstance(); + j.checkPermission(Jenkins.ADMINISTER); + + // This will be set up by default. if not, something changed, ok to fail + HudsonPrivateSecurityRealm securityRealm = (HudsonPrivateSecurityRealm)j.getSecurityRealm(); + + User admin = securityRealm.getUser(SetupWizard.initialSetupAdminUserName); + try { + if(admin != null) { + admin.delete(); // assume the new user may well be 'admin' + } + + User u = securityRealm.createAccountByAdmin(req, rsp, "/jenkins/install/SetupWizard/setupWizardFirstUser.jelly", j.getRootUrl()); + if (u != null) { + if(admin != null) { + admin = null; + } + + j.setInstallState(InstallState.CREATE_ADMIN_USER.getNextState()); + + // ... and then login + Authentication a = new UsernamePasswordAuthenticationToken(u.getId(),req.getParameter("password1")); + a = securityRealm.getSecurityComponents().manager.authenticate(a); + SecurityContextHolder.getContext().setAuthentication(a); + } + } finally { + if(admin != null) { + admin.save(); // recreate this initial user if something failed + } + } + } /** * Gets the file used to store the initial admin password @@ -163,40 +185,22 @@ public class SetupWizard { * This filter will validate that the security token is provided */ private final Filter FORCE_SETUP_WIZARD_FILTER = new Filter() { - private Pattern RESOURCE_PATTERN = Pattern.compile(".*[.](css|ttf|gif|woff|eot|png|js)"); - private Pattern ALLOWED_PATHS = Pattern.compile( - "\\Q/login\\E" - + "|\\Q/loginError\\E" - + "|\\Q/securityRealm/" + new HudsonPrivateSecurityRealm(true, false, null).getAuthenticationGatewayUrl() + "\\E"); @Override public void init(FilterConfig cfg) throws ServletException { } @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - // As an extra measure of security, the install wizard generates a security token, and - // requires the user to enter it before proceeding through the installation. Once set - // we'll set a cookie so the subsequent operations succeed + // Force root requests to the setup wizard if (request instanceof HttpServletRequest) { HttpServletRequest req = (HttpServletRequest)request; - // Allow js & css requests through - if (!RESOURCE_PATTERN.matcher(req.getRequestURI()).matches()) { // allow resources - boolean isAdmin = jenkins.getACL().hasPermission(Jenkins.ADMINISTER); - final String adjustedPath = req.getRequestURI().substring(req.getContextPath().length()); - final String destination; - // if the user hasn't authenticated, don't allow anything other than the login submit and error page - if (!isAdmin && !ALLOWED_PATHS.matcher(adjustedPath).matches()) { - destination = req.getContextPath() + "/login"; - } else if (isAdmin && "/".equals(adjustedPath)) { - destination = req.getContextPath() + "/setupWizard/"; - } else { - destination = req.getRequestURI(); - } + if((req.getContextPath() + "/").equals(req.getRequestURI())) { chain.doFilter(new HttpServletRequestWrapper(req) { public String getRequestURI() { - return destination; + return getContextPath() + "/setupWizard/"; } }, response); + return; } // fall through to handling the request normally } diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/setupWizardFirstUser.jelly b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly similarity index 83% rename from core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/setupWizardFirstUser.jelly rename to core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly index 4f7475462f..34357c9b0a 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/setupWizardFirstUser.jelly +++ b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly @@ -43,8 +43,8 @@ padding: 1px 8px; } -
- + + diff --git a/war/src/main/js/api/securityConfig.js b/war/src/main/js/api/securityConfig.js index 4b311b9a7e..7e4997df22 100644 --- a/war/src/main/js/api/securityConfig.js +++ b/war/src/main/js/api/securityConfig.js @@ -9,7 +9,7 @@ var jenkins = require('../util/jenkins'); */ exports.saveFirstUser = function($form, success, error) { jenkins.staplerPost( - '/securityRealm/createFirstAccount', + '/setupWizard/createAdminUser', $form, success, { dataType: 'html', diff --git a/war/src/main/js/templates/firstUserPanel.hbs b/war/src/main/js/templates/firstUserPanel.hbs index 7892aab108..aeb3b9627c 100644 --- a/war/src/main/js/templates/firstUserPanel.hbs +++ b/war/src/main/js/templates/firstUserPanel.hbs @@ -3,7 +3,7 @@