- * This is a negative switch so that the default value 'false' remains compatible with older installations. + * This is a negative switch so that the default value 'false' remains compatible with older installations. */ private final boolean disableSignup; @@ -279,14 +281,36 @@ 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 { - if(hasSomeUser()) { + boolean inSetup = !Jenkins.getInstance().getInstallState().isSetupComplete(); + if(!inSetup && hasSomeUser()) { rsp.sendError(SC_UNAUTHORIZED,"First user was already created"); return; } - User u = createAccount(req, rsp, false, "firstUser.jelly"); - if (u!=null) { - tryToMakeAdmin(u); - loginAndTakeBack(req, rsp, u); + + 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 + } } } diff --git a/core/src/main/java/hudson/slaves/WorkspaceList.java b/core/src/main/java/hudson/slaves/WorkspaceList.java index a344b45aac..9b41599892 100644 --- a/core/src/main/java/hudson/slaves/WorkspaceList.java +++ b/core/src/main/java/hudson/slaves/WorkspaceList.java @@ -26,6 +26,7 @@ package hudson.slaves; import hudson.FilePath; import hudson.Functions; import hudson.model.Computer; +import hudson.model.DirectoryBrowserSupport; import java.io.Closeable; import java.util.Date; @@ -283,6 +284,25 @@ public final class WorkspaceList { }; } + /** + * Locates a conventional temporary directory to be associated with a workspace. + *
This directory is suitable for temporary files to be deleted later in the course of a build, + * or caches and local repositories which should persist across builds done in the same workspace. + * (If multiple workspaces are present for a single job built concurrently, via {@link #allocate(FilePath)}, each will get its own temporary directory.) + *
It may also be used for security-sensitive files which {@link DirectoryBrowserSupport} ought not serve, + * acknowledging that these will be readable by builds of other jobs done on the same node. + *
Each plugin using this directory is responsible for specifying sufficiently unique subdirectory/file names. + * {@link FilePath#createTempFile} may be used for this purpose if desired. + *
The resulting directory may not exist; you may call {@link FilePath#mkdirs} on it if you need it to.
+ * It may be deleted alongside the workspace itself during cleanup actions.
+ * @param ws a directory such as a build workspace
+ * @return a sibling directory, for example {@code …/something@tmp} for {@code …/something}
+ * @since 1.652
+ */
+ public static FilePath tempDir(FilePath ws) {
+ return ws.sibling(ws.getName() + COMBINATOR + "tmp");
+ }
+
private static final Logger LOGGER = Logger.getLogger(WorkspaceList.class.getName());
/**
diff --git a/core/src/main/java/jenkins/install/InstallState.java b/core/src/main/java/jenkins/install/InstallState.java
index 510feb6c78..c634180bc8 100644
--- a/core/src/main/java/jenkins/install/InstallState.java
+++ b/core/src/main/java/jenkins/install/InstallState.java
@@ -34,32 +34,63 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
@Restricted(NoExternalUse.class)
public enum InstallState {
/**
- * New Jenkins install.
+ * The initial set up has been completed
*/
- NEW,
+ INITIAL_SETUP_COMPLETED(true, null),
+ /**
+ * Creating an admin user for an initial Jenkins install.
+ */
+ CREATE_ADMIN_USER(false, INITIAL_SETUP_COMPLETED),
/**
* New Jenkins install. The user has kicked off the process of installing an
* initial set of plugins (via the install wizard).
*/
- INITIAL_PLUGINS_INSTALLING,
+ INITIAL_PLUGINS_INSTALLING(false, CREATE_ADMIN_USER),
/**
- * New Jenkins install. The initial set of plugins are now installed.
+ * New Jenkins install.
*/
- INITIAL_PLUGINS_INSTALLED,
+ NEW(false, INITIAL_PLUGINS_INSTALLING),
/**
* Restart of an existing Jenkins install.
*/
- RESTART,
+ RESTART(true, INITIAL_SETUP_COMPLETED),
/**
* Upgrade of an existing Jenkins install.
*/
- UPGRADE,
+ UPGRADE(true, INITIAL_SETUP_COMPLETED),
/**
* Downgrade of an existing Jenkins install.
*/
- DOWNGRADE,
+ DOWNGRADE(true, INITIAL_SETUP_COMPLETED),
/**
* Jenkins started in test mode (JenkinsRule).
*/
- TEST
+ TEST(true, INITIAL_SETUP_COMPLETED),
+ /**
+ * Jenkins started in development mode: Bolean.getBoolean("hudson.Main.development").
+ * Can be run normally with the -Djenkins.install.runSetupWizard=true
+ */
+ DEVELOPMENT(true, INITIAL_SETUP_COMPLETED);
+
+ private final boolean isSetupComplete;
+ private final InstallState nextState;
+
+ private InstallState(boolean isSetupComplete, InstallState nextState) {
+ this.isSetupComplete = isSetupComplete;
+ this.nextState = nextState;
+ }
+
+ /**
+ * Indicates the initial setup is complete
+ */
+ public boolean isSetupComplete() {
+ return isSetupComplete;
+ }
+
+ /**
+ * Gets the next state
+ */
+ public InstallState getNextState() {
+ return nextState;
+ }
}
diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java
index e9622b1a9a..475d1a3e01 100644
--- a/core/src/main/java/jenkins/install/InstallUtil.java
+++ b/core/src/main/java/jenkins/install/InstallUtil.java
@@ -61,6 +61,7 @@ public class InstallUtil {
private static final Logger LOGGER = Logger.getLogger(InstallUtil.class.getName());
+ // tests need this to be 1.0
private static final VersionNumber NEW_INSTALL_VERSION = new VersionNumber("1.0");
/**
@@ -68,8 +69,15 @@ public class InstallUtil {
* @return The type of "startup" currently under way in Jenkins.
*/
public static InstallState getInstallState() {
- if (Functions.getIsUnitTest()) {
- return InstallState.TEST;
+ // install wizard will always run if environment specified
+ if (!Boolean.getBoolean("jenkins.install.runSetupWizard")) {
+ if (Functions.getIsUnitTest()) {
+ return InstallState.TEST;
+ }
+
+ if (Boolean.getBoolean("hudson.Main.development")) {
+ return InstallState.DEVELOPMENT;
+ }
}
VersionNumber lastRunVersion = new VersionNumber(getLastExecVersion());
@@ -77,6 +85,12 @@ public class InstallUtil {
// Neither the top level config or the lastExecVersionFile have a version
// stored in them, which means it's a new install.
if (lastRunVersion.compareTo(NEW_INSTALL_VERSION) == 0) {
+ // Edge case: used Jenkins 1 but did not save the system config page,
+ // the version is not persisted and returns 1.0, so try to check if
+ // they actually did anything
+ if (!Jenkins.getInstance().getItemMap().isEmpty()) {
+ return InstallState.UPGRADE;
+ }
return InstallState.NEW;
}
diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java
new file mode 100644
index 0000000000..b7e3f13a95
--- /dev/null
+++ b/core/src/main/java/jenkins/install/SetupWizard.java
@@ -0,0 +1,178 @@
+package jenkins.install;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.logging.Logger;
+
+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 org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
+
+import hudson.BulkChange;
+import hudson.ExtensionList;
+import hudson.model.User;
+import hudson.model.UserProperty;
+import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
+import hudson.security.HudsonPrivateSecurityRealm;
+import hudson.security.PermissionAdder;
+import hudson.security.SecurityRealm;
+import hudson.security.csrf.DefaultCrumbIssuer;
+import hudson.util.HttpResponses;
+import hudson.util.PluginServletFilter;
+import jenkins.model.Jenkins;
+import jenkins.security.s2m.AdminWhitelistRule;
+
+/**
+ * A Jenkins instance used during first-run to provide a limited set of services while
+ * initial installation is in progress
+ */
+public class SetupWizard {
+ /**
+ * The security token parameter name
+ */
+ public static String initialSetupAdminUserName = "admin";
+
+ private final Logger LOGGER = Logger.getLogger(SetupWizard.class.getName());
+
+ public SetupWizard(Jenkins j) throws IOException {
+ User admin;
+ // Create an admin user by default with a
+ // difficult password
+ if(j.getSecurityRealm() == null || j.getSecurityRealm() == SecurityRealm.NO_AUTHENTICATION) { // this seems very fragile
+ BulkChange bc = new BulkChange(j);
+
+ HudsonPrivateSecurityRealm securityRealm = new HudsonPrivateSecurityRealm(false, false, null);
+ j.setSecurityRealm(securityRealm);
+ String randomUUID = UUID.randomUUID().toString().replace("-", "").toLowerCase(Locale.ENGLISH);
+ admin = securityRealm.createAccount(SetupWizard.initialSetupAdminUserName, randomUUID);
+ admin.addProperty(new SetupWizard.AuthenticationKey(randomUUID));
+
+ // Lock Jenkins down:
+ FullControlOnceLoggedInAuthorizationStrategy authStrategy = new FullControlOnceLoggedInAuthorizationStrategy();
+ authStrategy.setAllowAnonymousRead(false);
+ j.setAuthorizationStrategy(authStrategy);
+
+ // Shut down all the ports we can by default:
+ j.setSlaveAgentPort(-1); // -1 to disable
+
+ // require a crumb issuer
+ j.setCrumbIssuer(new DefaultCrumbIssuer(false));
+
+ // set master -> slave security:
+ j.getInjector().getInstance(AdminWhitelistRule.class)
+ .setMasterKillSwitch(false);
+
+ try{
+ j.save(); // !!
+ } finally {
+ bc.commit();
+ }
+ }
+ else {
+ admin = j.getUser(SetupWizard.initialSetupAdminUserName);
+ }
+
+ String setupKey = null;
+ if(admin != null && admin.getProperty(SetupWizard.AuthenticationKey.class) != null) {
+ setupKey = admin.getProperty(SetupWizard.AuthenticationKey.class).getKey();
+ }
+ if(setupKey != null) {
+ LOGGER.info("\n\n*************************************************************\n"
+ + "*************************************************************\n"
+ + "*************************************************************\n"
+ + "\n"
+ + "Jenkins initial setup is required. A security token is required to proceed. \n"
+ + "Please use the following security token to proceed to installation: \n"
+ + "\n"
+ + "" + setupKey + "\n"
+ + "\n"
+ + "*************************************************************\n"
+ + "*************************************************************\n"
+ + "*************************************************************\n");
+ }
+
+ try {
+ PluginServletFilter.addFilter(FORCE_SETUP_WIZARD_FILTER);
+ } catch (ServletException e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ /**
+ * Remove the setupWizard filter, ensure all updates are written to disk, etc
+ */
+ public HttpResponse doCompleteInstall(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+ Jenkins j = Jenkins.getActiveInstance();
+ j.setInstallState(InstallState.INITIAL_SETUP_COMPLETED);
+ InstallUtil.saveLastExecVersion();
+ PluginServletFilter.removeFilter(FORCE_SETUP_WIZARD_FILTER);
+ // Also, clean up the setup wizard if it's completed
+ j.setSetupWizard(null);
+ return HttpResponses.okJSON();
+ }
+
+ // Stores a user property for the authentication key, which is really the auto-generated user's password
+ public static class AuthenticationKey extends UserProperty {
+ String key;
+
+ public AuthenticationKey() {
+ }
+
+ public AuthenticationKey(String key) {
+ this.key = key;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+ }
+
+ /**
+ * This filter will validate that the security token is provided
+ */
+ private final Filter FORCE_SETUP_WIZARD_FILTER = new Filter() {
+ @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
+ 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())) {
+ chain.doFilter(new HttpServletRequestWrapper(req) {
+ public String getRequestURI() {
+ return getContextPath() + "/setupWizard/";
+ }
+ }, response);
+ return;
+ }
+ // fall through to handling the request normally
+ }
+ chain.doFilter(request, response);
+ }
+
+ @Override
+ public void destroy() {
+ }
+ };
+}
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 60154b64fe..d34fa105a4 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -194,6 +194,7 @@ import jenkins.ExtensionRefreshException;
import jenkins.InitReactorRunner;
import jenkins.install.InstallState;
import jenkins.install.InstallUtil;
+import jenkins.install.SetupWizard;
import jenkins.model.ProjectNamingStrategy.DefaultProjectNamingStrategy;
import jenkins.security.ConfidentialKey;
import jenkins.security.ConfidentialStore;
@@ -333,7 +334,13 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
/**
* The Jenkins instance startup type i.e. NEW, UPGRADE etc
*/
- private InstallState installState;
+ private transient InstallState installState = InstallState.NEW;
+
+ /**
+ * If we're in the process of an initial setup,
+ * this will be set
+ */
+ private transient SetupWizard setupWizard;
/**
* Number of executors of the master node.
@@ -759,7 +766,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
long start = System.currentTimeMillis();
- // As Jenkins is starting, grant this process full control
+ // As Jenkins is starting, grant this process full control
ACL.impersonate(ACL.SYSTEM);
try {
this.root = root;
@@ -773,7 +780,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
if (installState == InstallState.RESTART || installState == InstallState.DOWNGRADE) {
InstallUtil.saveLastExecVersion();
}
-
+
if (!new File(root,"jobs").exists()) {
// if this is a fresh install, use more modern default layout that's consistent with agents
workspaceDir = "${JENKINS_HOME}/workspace/${ITEM_FULLNAME}";
@@ -834,6 +841,11 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
if(KILL_AFTER_LOAD)
System.exit(0);
+ if(!installState.isSetupComplete()) {
+ // Start immediately with the setup wizard for new installs
+ setupWizard = new SetupWizard(this);
+ }
+
launchTcpSlaveAgentListener();
if (UDPBroadcastThread.PORT != -1) {
@@ -913,6 +925,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
* Get the Jenkins {@link jenkins.install.InstallState install state}.
* @return The Jenkins {@link jenkins.install.InstallState install state}.
*/
+ @Nonnull
@Restricted(NoExternalUse.class)
public InstallState getInstallState() {
return installState;
@@ -1437,10 +1450,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
*/
@Exported(name="jobs")
public List \
For information about installing Jenkins without an internet connection, see the \
Offline Jenkins Installation Documentation. {{{translations.installWizard_offline_message}}} {{{translations.installWizard_offline_message}}}
+
+
+ {{translations.installWizard_installComplete_message}} {{translations.installWizard_installComplete_restartRequiredMessage}} {{translations.installWizard_installComplete_message}} {{translations.installWizard_installComplete_message}} {{translations.installWizard_installComplete_restartRequiredMessage}}
+ If checked, this will allow users who are not authenticated to access Jenkins in a read-only mode.
+
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
index bb12a30aa9..346d8c4d53 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
@@ -25,64 +25,43 @@ THE SOFTWARE.
${title}
-
-
- ${data.errorMessage}
-
- ${title}
+
+
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly
new file mode 100644
index 0000000000..8009ad6518
--- /dev/null
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly
@@ -0,0 +1,50 @@
+
+
+
+
+
+ ${data.errorMessage}
-
-
+
+
+
+
+ ${%Username}:
+
+
+
+ ${%Password}:
+
+
+
+ ${%Confirm password}:
+
+
+
+ ${%Full name}:
+
+
+
+ ${%E-mail address}:
+
+
+
+ ${%Enter text as shown}:
+
+
+
+
+
${%HTTP Proxy Configuration}
+
\
-If you need to configure a proxy, you may close this wizard and use the Plugin Manager. \
+You may choose to continue by configuring a proxy or skipping plugin installation. \
\
+You've skipped creating an admin user. To log in, use the username: 'admin' and \
+the security token you used to access the setup wizard.\
+
+installWizard_addFirstUser_title=Create an Admin User
+installWizard_configureProxy_label=Configure Proxy
+installWizard_configureProxy_save=Save and Continue
+installWizard_skipPluginInstallations=Skip Plugin Installations
installWizard_installIncomplete_dependenciesLabel=Dependencies
diff --git a/core/src/main/resources/jenkins/model/Jenkins/login.jelly b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
index f7e02a5f50..b3c91c7b5b 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/login.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
@@ -24,6 +24,10 @@ THE SOFTWARE.
+
+
+
+
+
+{{translations.installWizard_addFirstUser_title}}
+
+
+
diff --git a/war/src/main/js/templates/incompleteInstallationPanel.hbs b/war/src/main/js/templates/incompleteInstallationPanel.hbs
index 36d7daadd1..10268a1037 100644
--- a/war/src/main/js/templates/incompleteInstallationPanel.hbs
+++ b/war/src/main/js/templates/incompleteInstallationPanel.hbs
@@ -1,5 +1,4 @@
+
+
+
-
{{translations.installWizard_installIncomplete_title}}
diff --git a/war/src/main/js/templates/offlinePanel.hbs b/war/src/main/js/templates/offlinePanel.hbs
index 1a38c81117..d10d78a444 100644
--- a/war/src/main/js/templates/offlinePanel.hbs
+++ b/war/src/main/js/templates/offlinePanel.hbs
@@ -1,10 +1,13 @@
-
-
{{translations.installWizard_offline_title}}
+ {{translations.installWizard_offline_title}}
-
diff --git a/war/src/main/js/templates/pluginSelectionPanel.hbs b/war/src/main/js/templates/pluginSelectionPanel.hbs
index 11bcfcb329..addd570e56 100644
--- a/war/src/main/js/templates/pluginSelectionPanel.hbs
+++ b/war/src/main/js/templates/pluginSelectionPanel.hbs
@@ -1,5 +1,4 @@
-
+ {{translations.installWizard_offline_title}}
-
+
{{translations.installWizard_offline_title}}
+
-
{{translations.installWizard_installCustom_title}}
diff --git a/war/src/main/js/templates/proxyConfigPanel.hbs b/war/src/main/js/templates/proxyConfigPanel.hbs
new file mode 100644
index 0000000000..ac4b259bb0
--- /dev/null
+++ b/war/src/main/js/templates/proxyConfigPanel.hbs
@@ -0,0 +1,16 @@
+
+
+{{translations.installWizard_configureProxy_label}}
+
+
+
diff --git a/war/src/main/js/templates/setupCompletePanel.hbs b/war/src/main/js/templates/setupCompletePanel.hbs
new file mode 100644
index 0000000000..7527af4eaa
--- /dev/null
+++ b/war/src/main/js/templates/setupCompletePanel.hbs
@@ -0,0 +1,22 @@
+
+
+
+
+
+{{translations.installWizard_installComplete_title}}
+
+
diff --git a/war/src/main/js/templates/successPanel.hbs b/war/src/main/js/templates/successPanel.hbs
index 1889ffc2b4..6efbe9d369 100644
--- a/war/src/main/js/templates/successPanel.hbs
+++ b/war/src/main/js/templates/successPanel.hbs
@@ -1,10 +1,9 @@
+
+{{translations.installWizard_installComplete_banner}}
+
+ {{{message}}}
+
+ {{#if restartRequired}}
+
-
-
{{translations.installWizard_installComplete_title}}
+ {{translations.installWizard_pluginsInstalled_title}}
- {{translations.installWizard_installComplete_banner}}
+ {{translations.installWizard_pluginsInstalled_banner}}
{{#if restartRequired}}
-
{{translations.installWizard_welcomePanel_title}}
diff --git a/war/src/main/js/util/jenkins.js b/war/src/main/js/util/jenkins.js
index ffc5ab8be9..0423f1d6a4 100644
--- a/war/src/main/js/util/jenkins.js
+++ b/war/src/main/js/util/jenkins.js
@@ -28,15 +28,15 @@ exports.stringify = function(o) {
h: Hash.prototype.toJSON,
s: String.prototype.toJSON
};
- try {
- delete Array.prototype.toJSON;
+ try {
+ delete Array.prototype.toJSON;
delete Object.prototype.toJSON;
- delete Hash.prototype.toJSON;
- delete String.prototype.toJSON;
+ delete Hash.prototype.toJSON;
+ delete String.prototype.toJSON;
return JSON.stringify(o);
- }
- finally {
+ }
+ finally {
if(protoJSON.a) {
Array.prototype.toJSON = protoJSON.a;
}
@@ -49,7 +49,7 @@ exports.stringify = function(o) {
if(protoJSON.s) {
String.prototype.toJSON = protoJSON.s;
}
- }
+ }
}
else {
return JSON.stringify(o);
@@ -67,7 +67,7 @@ exports.idIfy = function(str) {
* redirect
*/
exports.goTo = function(url) {
- wh.getWindow().location.replace(exports.baseUrl() + url);
+ wh.getWindow().location.replace(exports.baseUrl() + url);
};
/**
@@ -76,13 +76,13 @@ exports.goTo = function(url) {
*/
exports.get = function(url, success, options) {
if(debug) {
- console.log('get: ' + url);
- }
+ console.log('get: ' + url);
+ }
var $ = jquery.getJQuery();
var args = {
url: exports.baseUrl() + url,
type: 'GET',
- cache: false,
+ cache: false,
dataType: 'json',
success: success
};
@@ -98,22 +98,49 @@ exports.get = function(url, success, options) {
*/
exports.post = function(url, data, success, options) {
if(debug) {
- console.log('post: ' + url);
- }
+ console.log('post: ' + url);
+ }
+
var $ = jquery.getJQuery();
+
+ // handle crumbs
+ var headers = {};
+ var wnd = wh.getWindow();
+ var crumb;
+ if('crumb' in options) {
+ crumb = options.crumb;
+ }
+ else if('crumb' in wnd) {
+ crumb = wnd.crumb;
+ }
+
+ if(crumb) {
+ headers[crumb.fieldName] = crumb.value;
+ }
+
+ var formBody = data;
+ if(formBody instanceof Object) {
+ if(crumb) {
+ formBody = $.extend({}, formBody);
+ formBody[crumb.fieldName] = crumb.value;
+ }
+ formBody = exports.stringify(formBody);
+ }
+
var args = {
url: exports.baseUrl() + url,
type: 'POST',
- cache: false,
+ cache: false,
dataType: 'json',
- data: exports.stringify(data),
- contentType: "application/json",
- success: success
+ data: formBody,
+ contentType: "application/json",
+ success: success,
+ headers: headers
};
if(options instanceof Object) {
$.extend(args, options);
}
- $.ajax(args);
+ $.ajax(args);
};
/**
@@ -124,20 +151,20 @@ exports.initHandlebars = function() {
Handlebars.registerHelper('ifeq', function(o1, o2, options) {
if(o1 === o2) {
- return options.fn();
- }
+ return options.fn();
+ }
});
Handlebars.registerHelper('ifneq', function(o1, o2, options) {
if(o1 !== o2) {
- return options.fn();
- }
+ return options.fn();
+ }
});
Handlebars.registerHelper('in-array', function(arr, val, options) {
if(arr.indexOf(val) >= 0) {
- return options.fn();
- }
+ return options.fn();
+ }
});
Handlebars.registerHelper('id', exports.idIfy);
@@ -186,3 +213,64 @@ exports.testConnectivity = function(handler) {
};
testConnectivity();
};
+
+/**
+ * gets the window containing a form, taking in to account top-level iframes
+ */
+exports.getWindow = function($form) {
+ var $ = jquery.getJQuery();
+ $form = $($form);
+ var wnd = wh.getWindow();
+ $(top.document).find('iframe').each(function() {
+ var windowFrame = this.contentWindow;
+ var $f = $(this).contents().find('form');
+ if($f.length > 0 && $form[0] === $f[0]) {
+ wnd = windowFrame;
+ }
+ });
+ return wnd;
+};
+
+/**
+ * Builds a stapler form post
+ */
+exports.buildFormPost = function($form) {
+ var $ = jquery.getJQuery();
+ $form = $($form);
+ var wnd = exports.getWindow($form);
+ var form = $form[0];
+ if(wnd.buildFormTree(form)) {
+ return $form.serialize() +
+ '&core:apply=&Submit=Save&json=' + $form.find('input[name=json]').val();
+ }
+ return '';
+};
+
+/**
+ * Gets the crumb, if crumbs are enabled
+ */
+exports.getFormCrumb = function($form) {
+ var $ = jquery.getJQuery();
+ $form = $($form);
+ var wnd = exports.getWindow($form);
+ return wnd.crumb;
+};
+
+/**
+ * Jenkins Stapler JSON POST callback
+ * If last parameter is an object, will be extended to jQuery options (e.g. pass { error: function() ... } to handle errors)
+ */
+exports.staplerPost = function(url, $form, success, options) {
+ var $ = jquery.getJQuery();
+ $form = $($form);
+ var postBody = exports.buildFormPost($form);
+ var crumb = exports.getFormCrumb($form);
+ exports.post(
+ url,
+ postBody,
+ success, $.extend({
+ processData: false,
+ contentType: 'application/x-www-form-urlencoded',
+ crumb: crumb
+ }, options));
+};
diff --git a/war/src/main/less/pluginSetupWizard.less b/war/src/main/less/pluginSetupWizard.less
index af80db4c25..ac95881fab 100644
--- a/war/src/main/less/pluginSetupWizard.less
+++ b/war/src/main/less/pluginSetupWizard.less
@@ -4,257 +4,261 @@
.plugin-setup-wizard() {
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 1000;
- background: rgba(0,0,0,.2);
- text-align: initial;
- font-family: sans-serif;
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 1000;
+ background: rgba(0,0,0,.2);
+ text-align: initial;
+ font-family: sans-serif;
- table, form, input, td, th, p, textarea, select,h1,h2,h3,h4,h5{
- font-family:'roboto',sans-serif;
- }
+ table, form, input, td, th, p, textarea, select,h1,h2,h3,h4,h5{
+ font-family:'roboto',sans-serif;
+ }
- input,password { // get rid of the ms X (it doesn't fire a change event!), we provide our own
- &::-ms-clear { width : 0; height: 0; }
- &::-ms-reveal { width : 0; height: 0; }
- }
+ input,password { // get rid of the ms X (it doesn't fire a change event!), we provide our own
+ &::-ms-clear { width : 0; height: 0; }
+ &::-ms-reveal { width : 0; height: 0; }
+ }
- a, button {
- &:focus, &:active { outline: 0; }
- }
+ a, button {
+ &:focus, &:active { outline: 0; }
+ }
- .spin(@duration: 2s) {
- -webkit-animation-name: spin;
- -webkit-animation-duration: @duration;
- -webkit-animation-iteration-count: infinite;
- -webkit-animation-timing-function: linear;
- -moz-animation-name: spin;
- -moz-animation-duration: @duration;
- -moz-animation-iteration-count: infinite;
- -moz-animation-timing-function: linear;
- -ms-animation-name: spin;
- -ms-animation-duration: @duration;
- -ms-animation-iteration-count: infinite;
- -ms-animation-timing-function: linear;
- animation-name: spin;
- animation-duration: @duration;
- animation-iteration-count: infinite;
- animation-timing-function: linear;
- }
+ .spin(@duration: 2s) {
+ -webkit-animation-name: spin;
+ -webkit-animation-duration: @duration;
+ -webkit-animation-iteration-count: infinite;
+ -webkit-animation-timing-function: linear;
+ -moz-animation-name: spin;
+ -moz-animation-duration: @duration;
+ -moz-animation-iteration-count: infinite;
+ -moz-animation-timing-function: linear;
+ -ms-animation-name: spin;
+ -ms-animation-duration: @duration;
+ -ms-animation-iteration-count: infinite;
+ -ms-animation-timing-function: linear;
+ animation-name: spin;
+ animation-duration: @duration;
+ animation-iteration-count: infinite;
+ animation-timing-function: linear;
+ }
- .no-spin() {
- -webkit-animation-name: none;
- -moz-animation-name: none;
- -ms-animation-name: none;
- animation-name: none;
- }
+ .no-spin() {
+ -webkit-animation-name: none;
+ -moz-animation-name: none;
+ -ms-animation-name: none;
+ animation-name: none;
+ }
+
+ .modal {
+ padding: 20px 0;
+ }
- .modal-dialog {
- width: 90%;
- height: 90%;
- padding: 0;
- position: relative;
- margin: 3% auto;
- max-width:992px;
- font-family:'roboto',sans-serif;
- }
+ .modal-dialog {
+ width: 90%;
+ height: 100%;
+ padding: 0;
+ position: relative;
+ margin: 0 auto;
+ max-width:992px;
+ font-family:'roboto',sans-serif;
+ }
- .modal-content {
- height: 100%;
- position: relative;
- box-sizing: border-box;
- padding: 4.2em 0 4.8em 0;
- }
+ .modal-content {
+ height: 100%;
+ position: relative;
+ box-sizing: border-box;
+ padding: 4.2em 0 4.8em 0;
+ }
- .container.error-container {
- padding: 4em 3em;
+ .container.error-container {
+ padding: 4em 3em;
- h1 {
- color: #a94442;
- }
- }
+ h1 {
+ color: #a94442;
+ }
+ }
- .modal-body {
- background: linear-gradient(175deg, #f8f8f8 0%, rgba(255, 255, 255, 1) 22%, rgba(255, 255, 255, 0) 100%);
- overflow-y: auto;
- height: 100%;
- padding:0;
- border-bottom:1px solid #ccc;
+ .modal-body {
+ background: linear-gradient(175deg, #f8f8f8 0%, rgba(255, 255, 255, 1) 22%, rgba(255, 255, 255, 0) 100%);
+ overflow-y: auto;
+ height: 100%;
+ padding:0;
+ border-bottom:1px solid #ccc;
- .water-mark{
- font-size: 392px;
- position: absolute;
- display: block;
- bottom: 0px;
- right: 50px;
- color: rgba(0,0,0,.05);
- }
+ .water-mark{
+ font-size: 392px;
+ position: absolute;
+ display: block;
+ bottom: 0px;
+ right: 50px;
+ color: rgba(0,0,0,.05);
+ }
- .installing-panel{
- border-bottom:1px solid #ccc;
- margin:0;
- padding:7.5% 10%;
- height:33.3%;
- position:relative;
- z-index:9;
- box-shadow:rgba(0,0,0,.5) 0 1px 5px;
+ .installing-panel{
+ border-bottom:1px solid #ccc;
+ margin:0;
+ padding:7.5% 10%;
+ height:33.3%;
+ position:relative;
+ z-index:9;
+ box-shadow:rgba(0,0,0,.5) 0 1px 5px;
- @media screen and (max-width: 992px) {
- padding:5%;
+ @media screen and (max-width: 992px) {
+ padding:5%;
h1{
font-size:24px;
}
- }
+ }
- @media screen and (max-width: 768px) {
- padding:5%;
- height:auto;
- h1{
- display:none;
- }
- }
+ @media screen and (max-width: 768px) {
+ padding:5%;
+ height:auto;
+ h1{
+ display:none;
+ }
+ }
- .progress{
- margin:0;
- }
+ .progress{
+ margin:0;
+ }
- .selected-plugin-progress{
- width:75%;
- }
- }
+ .selected-plugin-progress{
+ width:75%;
+ }
+ }
- }
+ }
- .modal-header {
- position: absolute;
- top: 0;
- right: 0;
- left: 0;
- height: 4.2em;
- z-index: 2;
- background: #fff;
- border-radius: 5px 5px 0 0;
+ .modal-header {
+ position: absolute;
+ top: 0;
+ right: 0;
+ left: 0;
+ height: 4.2em;
+ z-index: 2;
+ background: #fff;
+ border-radius: 5px 5px 0 0;
- .close {
- line-height: 1.42857143;
- margin-right: 5px;
- }
- }
+ .close {
+ line-height: 1.42857143;
+ margin-right: 5px;
+ }
+ }
- .modal-footer {
- position: absolute;
- right: 0;
- bottom: 0;
- left: 0;
- height: 4.8em;
- padding: 1em;
- z-index: 2;
- background: #fff;
- border-radius: 0 0 5px 5px;
- }
+ .modal-footer {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ height: 4.8em;
+ padding: 1em;
+ z-index: 2;
+ background: #fff;
+ border-radius: 0 0 5px 5px;
+ }
- .plugin-selector {
+ .plugin-selector {
overflow-y: hidden;
- @media screen and (min-width: 768px) {
- height: 100%;
- }
+ @media screen and (min-width: 768px) {
+ height: 100%;
+ }
- .plugins {
- padding-top: 2.75em;
- position: relative;
- border-left:1px solid rgba(0,0,0,.2);
+ .plugins {
+ padding-top: 2.75em;
+ position: relative;
+ border-left:1px solid rgba(0,0,0,.2);
- @media screen and (min-width: 768px) {
- height: 100%;
- }
+ @media screen and (min-width: 768px) {
+ height: 100%;
+ }
- h2 {padding-top:10px; margin-top:0}
+ h2 {padding-top:10px; margin-top:0}
- .plugin-select-actions, .plugin-selected-info {
- position: absolute;
- top: 0;
- left: 10px;
- line-height: 34px;
+ .plugin-select-actions, .plugin-selected-info {
+ position: absolute;
+ top: 0;
+ left: 10px;
+ line-height: 34px;
- &.plugin-selected-info {
- right: 10px;
- left: auto;
- }
+ &.plugin-selected-info {
+ right: 10px;
+ left: auto;
+ }
- a + a:before {
- content: '|';
- font-size: 11px;
- text-decoration: none !important;
- display: inline-block;
- margin: 0 5px 0 2px;
- }
- }
+ a + a:before {
+ content: '|';
+ font-size: 11px;
+ text-decoration: none !important;
+ display: inline-block;
+ margin: 0 5px 0 2px;
+ }
+ }
- .plugin-search-controls {
- position: relative;
- display: block;
- margin: 0 -17px;
+ .plugin-search-controls {
+ position: relative;
+ display: block;
+ margin: 0 -17px;
- @media screen and (min-width: 768px) {
- width: 100%;
- max-width: 32em;
- margin: 0;
+ @media screen and (min-width: 768px) {
+ width: 100%;
+ max-width: 32em;
+ margin: 0;
- input[name=searchbox] {
- display: inline-block;
- }
- }
+ input[name=searchbox] {
+ display: inline-block;
+ }
+ }
- .clear-search {
- display: inline-block;
- position: absolute;
- top: 50%;
- right: 8px;
- margin-top: -12px;
- font-size: 23px;
- line-height: 30px;
- background: transparent;
- color: #ddd;
- text-decoration: none;
- font-weight: bold;
+ .clear-search {
+ display: inline-block;
+ position: absolute;
+ top: 50%;
+ right: 8px;
+ margin-top: -12px;
+ font-size: 23px;
+ line-height: 30px;
+ background: transparent;
+ color: #ddd;
+ text-decoration: none;
+ font-weight: bold;
- &:hover, &:focus {
- color: #444;
- }
- }
- }
+ &:hover, &:focus {
+ color: #444;
+ }
+ }
+ }
- .plugin-select-controls {
- @media screen and (min-width: 768px) {
- position: absolute;
- padding: 0 9em 0 14em;
- }
+ .plugin-select-controls {
+ @media screen and (min-width: 768px) {
+ position: absolute;
+ padding: 0 9em 0 14em;
+ }
- top: 0;
- right: 0;
- left: 0;
- padding: 0 10px;
- height: 2.75em;
- z-index: 100;
- background:rgba(0,0,0,.03);
- border-bottom:1px solid rgba(0,0,0,.2);
+ top: 0;
+ right: 0;
+ left: 0;
+ padding: 0 10px;
+ height: 2.75em;
+ z-index: 100;
+ background:rgba(0,0,0,.03);
+ border-bottom:1px solid rgba(0,0,0,.2);
- .form-control{
- font-size:13px;
- padding:2px 5px;
- height:30px;
- top:2px;
- position:relative;
- }
- }
+ .form-control{
+ font-size:13px;
+ padding:2px 5px;
+ height:30px;
+ top:2px;
+ position:relative;
+ }
+ }
.plugin-list-description {
margin: -10px -10px 0px -10px;
@@ -263,75 +267,75 @@
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
}
- .plugin-list {
- position: relative;
- padding: 10px;
- margin: 0 -15px;
- clear: both;
- @media screen and (min-width: 768px) {
- max-height: 100%;
- }
- overflow-y: auto;
+ .plugin-list {
+ position: relative;
+ padding: 10px;
+ margin: 0 -15px;
+ clear: both;
+ @media screen and (min-width: 768px) {
+ max-height: 100%;
+ }
+ overflow-y: auto;
- h2 {
- font-size:28px;
- transition: all .15s;
- &:first-child {
- margin-top: 0;
- }
- }
+ h2 {
+ font-size:28px;
+ transition: all .15s;
+ &:first-child {
+ margin-top: 0;
+ }
+ }
- &.searching-with-transition {
+ &.searching-with-transition {
.plugin {
- display: none;
- transition: all .25s;
+ display: none;
+ transition: all .25s;
- &.match {
- display: block;
- background: #d9edf7;
- margin: 4px -7px;
- padding: 6px 0 6px 26px;
- border-radius: 2px;
- border: 1px solid #bce8f1;
- color: #31708f;
+ &.match {
+ display: block;
+ background: #d9edf7;
+ margin: 4px -7px;
+ padding: 6px 0 6px 26px;
+ border-radius: 2px;
+ border: 1px solid #bce8f1;
+ color: #31708f;
- &.selected {
- background: #dff0d8;
- border: 1px solid #c2e0a9;
- color: #3c763d;
- }
- }
- }
- h2 {
- color: #ddd;
- transition: all .5s;
- font-size: 22px;
- margin: 6px 0 6px -5px;
- }
- }
+ &.selected {
+ background: #dff0d8;
+ border: 1px solid #c2e0a9;
+ color: #3c763d;
+ }
+ }
+ }
+ h2 {
+ color: #ddd;
+ transition: all .5s;
+ font-size: 22px;
+ margin: 6px 0 6px -5px;
+ }
+ }
- &.searching {
+ &.searching {
.plugin {
- display: none;
- transition: all .25s;
+ display: none;
+ transition: all .25s;
+
+ &.match {
+ display: block;
+ }
+ }
+ h2 {
+ display: none;
+ &.match {
+ color: #ddd;
+ transition: all .5s;
+ font-size: 22px;
+ margin: 6px 0 6px -5px;
+ display: block;
+ }
+ }
+ }
- &.match {
- display: block;
- }
- }
- h2 {
- display: none;
- &.match {
- color: #ddd;
- transition: all .5s;
- font-size: 22px;
- margin: 6px 0 6px -5px;
- display: block;
- }
- }
- }
-
.plugin {
position: relative;
@@ -348,52 +352,52 @@
}
}
- label {
- font-weight: normal;
- padding: 7px 2px 7px 27px;
- position: relative;
- display: block;
- cursor: pointer;
- margin: 4px -7px;
-
- &:hover{
- background: rgba(100, 200, 255, 0.1);
+ label {
+ font-weight: normal;
+ padding: 7px 2px 7px 27px;
+ position: relative;
+ display: block;
+ cursor: pointer;
+ margin: 4px -7px;
+
+ &:hover{
+ background: rgba(100, 200, 255, 0.1);
box-shadow:inset 0 400px 400px -100px rgba(100, 200, 255, 0.33), inset 0 0 0 1px rgba(100, 200, 255, 0.33);
- }
-
- .title {
- display: block;
- font-weight: bold;
- white-space: nowrap;
- position: relative;
- }
-
- .description {
- display: block;
- margin-top: .5em;
- }
-
- input[type=checkbox] {
- float: left;
- margin: 2px -18px;
- vertical-align: middle;
- }
-
- + .tooltip {
- left: 2px !important;
- margin-right: 16px;
-
- .tooltip-arrow {
- left: 4em !important;
- }
-
- .tooltip-inner {
- max-width: none;
- padding: .5em 1em;
- text-align: left;
- }
- }
- }
+ }
+
+ .title {
+ display: block;
+ font-weight: bold;
+ white-space: nowrap;
+ position: relative;
+ }
+
+ .description {
+ display: block;
+ margin-top: .5em;
+ }
+
+ input[type=checkbox] {
+ float: left;
+ margin: 2px -18px;
+ vertical-align: middle;
+ }
+
+ + .tooltip {
+ left: 2px !important;
+ margin-right: 16px;
+
+ .tooltip-arrow {
+ left: 4em !important;
+ }
+
+ .tooltip-inner {
+ max-width: none;
+ padding: .5em 1em;
+ text-align: left;
+ }
+ }
+ }
.toggle-dependency-list {
position: absolute;
@@ -444,70 +448,70 @@
}
}
}
- }
- }
+ }
+ }
- .categories {
- position: relative;
- display: none;
- overflow-y: auto;
+ .categories {
+ position: relative;
+ display: none;
+ overflow-y: auto;
- @media screen and (min-width: 768px) {
- display: block;
- max-height: 100%;
- }
+ @media screen and (min-width: 768px) {
+ display: block;
+ max-height: 100%;
+ }
- .nav{
- margin:5px -5px;
- }
+ .nav{
+ margin:5px -5px;
+ }
- li {
- a {
- position: relative;
- padding: .5em;
- display: block;
- color: #444;
- text-decoration: none;
- background: transparent;
- border: none;
- font-weight:500;
- border-radius:none;
+ li {
+ a {
+ position: relative;
+ padding: .5em;
+ display: block;
+ color: #444;
+ text-decoration: none;
+ background: transparent;
+ border: none;
+ font-weight:500;
+ border-radius:none;
- &:after {
- content: '';
- display: none;
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- width: 2px;
- background: #337ab7;
- }
+ &:after {
+ content: '';
+ display: none;
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ width: 2px;
+ background: #337ab7;
+ }
- &:hover {
- background:rgba(100,200,255,.1);
- box-shadow:inset -200px 0 200px -200px rgba(100,200,255,.33);
- color: #337ab7;
+ &:hover {
+ background:rgba(100,200,255,.1);
+ box-shadow:inset -200px 0 200px -200px rgba(100,200,255,.33);
+ color: #337ab7;
- &:after {
- display: block;
- }
- }
- }
+ &:after {
+ display: block;
+ }
+ }
+ }
- &.active a {
- color: #337ab7;
+ &.active a {
+ color: #337ab7;
- &:after {
- display: block;
- width: 4px;
- }
- }
- }
- }
- }
+ &:after {
+ display: block;
+ width: 4px;
+ }
+ }
+ }
+ }
+ }
- .install-console {
+ .install-console {
border-left: 1px solid #ccc;
background: #f8f8f8;
position: absolute;
@@ -520,35 +524,35 @@
padding: 6px 0;
overflow:auto;
- @media screen and (max-width: 992px) {
+ @media screen and (max-width: 992px) {
width: 100%;
position:static;
max-height:33%;
}
- .selected {
- font: 12px monospace;
- overflow: auto;
- height: 100%;
- display:block;
- padding:1px 10px;
+ .selected {
+ font: 12px monospace;
+ overflow: auto;
+ height: 100%;
+ display:block;
+ padding:1px 10px;
- &:nth-child(odd){
- background:rgba(0,0,0,.05);
- }
- }
+ &:nth-child(odd){
+ background:rgba(0,0,0,.05);
+ }
+ }
- .dependent {
- color: #aaa;
- padding-left: .4em;
+ .dependent {
+ color: #aaa;
+ padding-left: .4em;
- &:before {
- content: ' ** ';
- }
- }
- }
+ &:before {
+ content: ' ** ';
+ }
+ }
+ }
- .selected-plugin-progress {
+ .selected-plugin-progress {
position: absolute;
bottom: 0;
overflow: hidden;
@@ -562,17 +566,17 @@
border-bottom:1px solid #ccc;
border-top:1px solid rgba(0,0,0,.1);
- @media screen and (max-width: 992px) {
- width: 100%;
- position:static;
- max-height:33%;
- }
- &.success-panel {
- bottom: 0;
- width:100%;
- }
+ @media screen and (max-width: 992px) {
+ width: 100%;
+ position:static;
+ max-height:33%;
+ }
+ &.success-panel {
+ bottom: 0;
+ width:100%;
+ }
- .selected-plugin {
+ .selected-plugin {
display: inline-block;
vertical-align: top;
padding: 5px 5px 5px 30px;
@@ -586,156 +590,171 @@
box-shadow:0 1px 3px rgba(0,0,0,.2);
background:rgba(255,255,255,.75);
- &:nth-child(odd){
- box-shadow:0 1px 3px rgba(0,0,0,.2),inset 0 0 0 999px rgba(0,0,0,.05);
- }
- &:before { // pending
- font-family: FontAwesome;
- font-size: 17px;
- content: '\f10c';
- color: rgba(0,0,0,.1);
- position: absolute;
- left:5px;
- }
+ &:nth-child(odd){
+ box-shadow:0 1px 3px rgba(0,0,0,.2),inset 0 0 0 999px rgba(0,0,0,.05);
+ }
+ &:before { // pending
+ font-family: FontAwesome;
+ font-size: 17px;
+ content: '\f10c';
+ color: rgba(0,0,0,.1);
+ position: absolute;
+ left:5px;
+ }
- &.installing {
- &:before {
- content: '\f021';
- color: rgba(0,60,100,.33);
- .spin();
- }
- }
- &.success {
- background:#e5f9e5;
- &:before {
- content: '\f00c';
- color: #3c763d;
+ &.installing {
+ &:before {
+ content: '\f021';
+ color: rgba(0,60,100,.33);
+ .spin();
+ }
+ }
+ &.success {
+ background:#e5f9e5;
+ &:before {
+ content: '\f00c';
+ color: #3c763d;
- .no-spin();
- }
- }
- &.fail {
- background:#fdd;
- &:before {
- content: '\f00d';
- color: #a94442;
- .no-spin();
- }
- }
- }
- }
+ .no-spin();
+ }
+ }
+ &.fail {
+ background:#fdd;
+ &:before {
+ content: '\f00d';
+ color: #a94442;
+ .no-spin();
+ }
+ }
+ }
+ }
- .welcome-panel {
- position: relative;
- background: transparent;
- padding: 0 10%;
+ .welcome-panel {
+ position: relative;
+ background: transparent;
+ padding: 0 10%;
- h1{font-size:48px; margin-top:5px;}
+ h1{font-size:48px; margin-top:5px;}
- @media screen and (min-width: 768px) {
- padding-top: 5%;
- }
+ @media screen and (min-width: 768px) {
+ padding-top: 5%;
+ }
- .button-set {
- margin-top: 40px;
+ .button-set {
+ margin-top: 40px;
- .btn {
- text-align: left;
- }
- }
+ .btn {
+ text-align: left;
+ }
+ }
- .btn-huge {
- font-weight:200;
- display: inline-block;
- text-align: initial;
- width: 22em;
- white-space: normal;
- vertical-align: top;
- min-height: 12.5em;
- margin-right: 1.3%;
- margin-top: 1em;
- padding:20px 25px;
- box-shadow:inset 0 -200px 200px -100px rgba(0,0,0,.1), 0 1px 3px rgba(0,0,0,.2);
- border:1px solid rgba(0,60,100,.5);
- text-shadow:#fff 0 1px 3px;
- position:relative;
- background:rgba(255,255,255,.75);
+ .btn-huge {
+ font-weight:200;
+ display: inline-block;
+ text-align: initial;
+ width: 22em;
+ white-space: normal;
+ vertical-align: top;
+ min-height: 12.5em;
+ margin-right: 1.3%;
+ margin-top: 1em;
+ padding:20px 25px;
+ box-shadow:inset 0 -200px 200px -100px rgba(0,0,0,.1), 0 1px 3px rgba(0,0,0,.2);
+ border:1px solid rgba(0,60,100,.5);
+ text-shadow:#fff 0 1px 3px;
+ position:relative;
+ background:rgba(255,255,255,.75);
- @media screen and (min-width: 768px) {
- max-width: 41%;
- min-width: 14em;
- margin-top: 0;
- }
+ @media screen and (min-width: 768px) {
+ max-width: 41%;
+ min-width: 14em;
+ margin-top: 0;
+ }
- &:hover{
- box-shadow:inset 0 1px 3px -1px rgba(0,0,0,.2);
+ &:hover{
+ box-shadow:inset 0 1px 3px -1px rgba(0,0,0,.2);
background:rgba(100,200,255,.1);
- }
- &:focus{
- background:#fff;
+ }
+ &:focus{
+ background:#fff;
box-shadow:inset 0 -200px 200px -100px rgba(0,0,0,.1),0 0 5px 3px rgba(00,180,250,.2);
}
&:hover:focus{
background:rgba(100,200,255,.1);
}
- &.btn-primary{
- background:rgba(200,240,255,.2);
+ &.btn-primary{
+ background:rgba(200,240,255,.2);
- box-shadow:inset 0 -200px 200px -100px rgba(0,120,160,.2), 0 1px 3px rgba(0,0,0,.2);
- color:rgba(0,80,120,1);
+ box-shadow:inset 0 -200px 200px -100px rgba(0,120,160,.2), 0 1px 3px rgba(0,0,0,.2);
+ color:rgba(0,80,120,1);
- &:hover{
- box-shadow:inset 0 1px 3px -1px rgba(0,0,0,.2);
+ &:hover{
+ box-shadow:inset 0 1px 3px -1px rgba(0,0,0,.2);
background:rgba(70,200,255,.2);
- }
- &:focus{
+ }
+ &:focus{
box-shadow:inset 0 -200px 200px -100px rgba(0,120,160,.2),0 0 5px 3px rgba(00,180,250,.2); }
- }
- .icon {
- position: absolute;
+ }
+ .icon {
+ position: absolute;
bottom: 20px;
right: 10px;
font-size: 144px;
opacity: .0;
- }
- b {
- display: block;
- font-size: 24px;
- line-height:100%;
- margin-bottom:5px;
- min-height:81px;
- font-weight:600;
- width:80%;
- }
- sub{
- font-size:21px;
- }
- span {
- display: block;
- }
- }
- }
+ }
+ b {
+ display: block;
+ font-size: 24px;
+ line-height:100%;
+ margin-bottom:5px;
+ min-height:81px;
+ font-weight:600;
+ width:80%;
+ }
+ sub{
+ font-size:21px;
+ }
+ span {
+ display: block;
+ }
+ }
+ }
+
+ .security-panel {
+ &.security-panel, > iframe {
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ border: 0;
+ width: 100%;
+ height: 100%;
+ padding: 0;
+ margin: 0;
+ }
+ }
}
@-ms-keyframes spin {
- from { -ms-transform: rotate(0deg); }
- to { -ms-transform: rotate(360deg); }
+ from { -ms-transform: rotate(0deg); }
+ to { -ms-transform: rotate(360deg); }
}
@-moz-keyframes spin {
- from { -moz-transform: rotate(0deg); }
- to { -moz-transform: rotate(360deg); }
+ from { -moz-transform: rotate(0deg); }
+ to { -moz-transform: rotate(360deg); }
}
@-webkit-keyframes spin {
- from { -webkit-transform: rotate(0deg); }
- to { -webkit-transform: rotate(360deg); }
+ from { -webkit-transform: rotate(0deg); }
+ to { -webkit-transform: rotate(360deg); }
}
@keyframes spin {
- from { transform:rotate(0deg); }
- to { transform:rotate(360deg); }
+ from { transform:rotate(0deg); }
+ to { transform:rotate(360deg); }
}
body .plugin-setup-wizard { // need specificity, revisit the CSS inclusion order
- .plugin-setup-wizard();
+ .plugin-setup-wizard();
}
@fb-loader-color: #E6E6E6;
@@ -743,59 +762,59 @@ body .plugin-setup-wizard { // need specificity, revisit the CSS inclusion order
.loader,
.loader:before,
.loader:after {
- background: @fb-loader-color;
- -webkit-animation: fb-loader 1s infinite ease-in-out;
- animation: fb-loader 1s infinite ease-in-out;
- width: 7px;
- height: 8px;
+ background: @fb-loader-color;
+ -webkit-animation: fb-loader 1s infinite ease-in-out;
+ animation: fb-loader 1s infinite ease-in-out;
+ width: 7px;
+ height: 8px;
}
.loader:before,
.loader:after {
- position: absolute;
- top: 0;
- content: '';
+ position: absolute;
+ top: 0;
+ content: '';
}
.loader:before {
- left: -10px;
- -webkit-animation-delay: -0.32s;
- animation-delay: -0.32s;
+ left: -10px;
+ -webkit-animation-delay: -0.32s;
+ animation-delay: -0.32s;
}
.loader {
- text-indent: -9999em;
- top: 50%;
- margin: -4px auto 0 auto;
- position: relative;
- font-size: 6px;
- -webkit-transform: translateZ(0);
- -ms-transform: translateZ(0);
- transform: translateZ(0);
- -webkit-animation-delay: -0.16s;
- animation-delay: -0.16s;
+ text-indent: -9999em;
+ top: 50%;
+ margin: -4px auto 0 auto;
+ position: relative;
+ font-size: 6px;
+ -webkit-transform: translateZ(0);
+ -ms-transform: translateZ(0);
+ transform: translateZ(0);
+ -webkit-animation-delay: -0.16s;
+ animation-delay: -0.16s;
}
.loader:after {
- left: 10px;
+ left: 10px;
}
@-webkit-keyframes fb-loader {
- 0%,
- 80%,
- 100% {
- box-shadow: 0 0 @fb-loader-color;
- height: 4em;
- }
- 40% {
- box-shadow: 0 -2em @fb-loader-color;
- height: 5em;
- }
+ 0%,
+ 80%,
+ 100% {
+ box-shadow: 0 0 @fb-loader-color;
+ height: 4em;
+ }
+ 40% {
+ box-shadow: 0 -2em @fb-loader-color;
+ height: 5em;
+ }
}
@keyframes fb-loader {
- 0%,
- 80%,
- 100% {
- box-shadow: 0 0 @fb-loader-color;
- height: 4em;
- }
- 40% {
- box-shadow: 0 -2em @fb-loader-color;
- height: 5em;
- }
+ 0%,
+ 80%,
+ 100% {
+ box-shadow: 0 0 @fb-loader-color;
+ height: 4em;
+ }
+ 40% {
+ box-shadow: 0 -2em @fb-loader-color;
+ height: 5em;
+ }
}
diff --git a/war/src/test/js/pluginSetupWizard-spec.js b/war/src/test/js/pluginSetupWizard-spec.js
index 5b1376aa1c..2674db2593 100644
--- a/war/src/test/js/pluginSetupWizard-spec.js
+++ b/war/src/test/js/pluginSetupWizard-spec.js
@@ -15,20 +15,20 @@ pluginList.recommendedPlugins = ['subversion'];
// Iterates through all responses until the end and returns the last response repeatedly
var LastResponse = function(responses) {
- var counter = 0;
- this.next = function() {
- if(counter < responses.length) {
- try {
- return responses[counter];
- } finally {
- counter++;
- }
- }
- if(responses.length > 0) {
- return responses[counter-1];
- }
- return { status: 'fail' };
- };
+ var counter = 0;
+ this.next = function() {
+ if(counter < responses.length) {
+ try {
+ return responses[counter];
+ } finally {
+ counter++;
+ }
+ }
+ if(responses.length > 0) {
+ return responses[counter-1];
+ }
+ return { status: 'fail' };
+ };
};
// common mocks for jQuery $.ajax
@@ -48,17 +48,23 @@ var ajaxMocks = function(responseMappings) {
},
'/jenkins/updateCenter/installStatus': new LastResponse([{
status: 'ok',
- data: [] // first, return nothing by default, no ongoing install
+ data: { // first, return nothing by default, no ongoing install
+ state: 'NEW',
+ jobs: []
+ }
},
{
status: 'ok',
- data: [
- {
- name: 'subversion',
- type: 'InstallJob',
- installStatus: 'Success'
- }
- ]
+ data: {
+ state: 'INSTALLING_PLUGINS',
+ jobs: [
+ {
+ name: 'subversion',
+ type: 'InstallJob',
+ installStatus: 'Success'
+ }
+ ]
+ }
}]),
'/jenkins/pluginManager/plugins': {
status: 'ok',
@@ -92,8 +98,8 @@ var ajaxMocks = function(responseMappings) {
}
},
'/jenkins/pluginManager/installPlugins': {
- status: 'ok',
- data: 'RANDOM_UUID_1234'
+ status: 'ok',
+ data: 'RANDOM_UUID_1234'
}
};
@@ -114,7 +120,7 @@ var ajaxMocks = function(responseMappings) {
throw 'No data mapping provided for AJAX call: ' + call.url;
}
if(response instanceof LastResponse) {
- response = response.next();
+ response = response.next();
}
call.success(response);
};
@@ -122,7 +128,7 @@ var ajaxMocks = function(responseMappings) {
// call this for each test, it will provide a new wizard, jquery to the caller
var test = function(test, ajaxMappings) {
- jsTest.onPage(function() {
+ jsTest.onPage(function() {
// deps
var $ = getJQuery();
@@ -133,41 +139,41 @@ var test = function(test, ajaxMappings) {
var pluginSetupWizard = jsTest.requireSrcModule('pluginSetupWizardGui');
// exported init
- pluginSetupWizard.init();
+ pluginSetupWizard.init('body');
test($, pluginSetupWizard);
- });
+ });
};
// helper to validate the appropriate plugins were installed
var validatePlugins = function(plugins, complete) {
var jenkins = jsTest.requireSrcModule('util/jenkins');
if(!jenkins.originalPost) {
- jenkins.originalPost = jenkins.post;
+ jenkins.originalPost = jenkins.post;
}
jenkins.post = function(url, data, cb) {
expect(url).toBe('/pluginManager/installPlugins');
var allMatch = true;
for(var i = 0; i < plugins.length; i++) {
- if(data.plugins.indexOf(plugins[i]) < 0) {
- allMatch = false;
- break;
- }
+ if(data.plugins.indexOf(plugins[i]) < 0) {
+ allMatch = false;
+ break;
+ }
}
if(!allMatch) {
expect(JSON.stringify(plugins)).toBe('In: ' + JSON.stringify(data.plugins));
}
// return status
cb({status:'ok',data:{correlationId:1}});
- if(complete) {
- complete();
- }
+ if(complete) {
+ complete();
+ }
};
};
describe("pluginSetupWizard.js", function () {
- it("wizard shows", function (done) {
- test(function($) {
+ it("wizard shows", function (done) {
+ test(function($) {
// Make sure the dialog was shown
var $wizard = $('.plugin-setup-wizard');
expect($wizard.size()).toBe(1);
@@ -176,49 +182,49 @@ describe("pluginSetupWizard.js", function () {
});
});
- it("offline shows", function (done) {
- jsTest.onPage(function() {
- // deps
- var jenkins = jsTest.requireSrcModule('./util/jenkins');
+ it("offline shows", function (done) {
+ jsTest.onPage(function() {
+ // deps
+ var jenkins = jsTest.requireSrcModule('./util/jenkins');
- var $ = getJQuery();
- $.ajax = ajaxMocks();
+ var $ = getJQuery();
+ $.ajax = ajaxMocks();
- var get = jenkins.get;
- try {
- // Respond with failure
- jenkins.get = function(url, cb) {
- if (debug) {
+ var get = jenkins.get;
+ try {
+ // Respond with failure
+ jenkins.get = function(url, cb) {
+ if (debug) {
console.log('Jenkins.GET: ' + url);
}
- if(url === '/updateCenter/connectionStatus?siteId=default') {
- cb({
- status: 'ok',
- data: {
- updatesite: 'ERROR',
- internet: 'ERROR'
- }
- });
- }
- else {
- get(url, cb);
- }
- };
+ if(url === '/updateCenter/connectionStatus?siteId=default') {
+ cb({
+ status: 'ok',
+ data: {
+ updatesite: 'ERROR',
+ internet: 'ERROR'
+ }
+ });
+ }
+ else {
+ get(url, cb);
+ }
+ };
- // load the module
- var pluginSetupWizard = jsTest.requireSrcModule('pluginSetupWizardGui');
+ // load the module
+ var pluginSetupWizard = jsTest.requireSrcModule('pluginSetupWizardGui');
- // exported init
- pluginSetupWizard.init();
+ // exported init
+ pluginSetupWizard.init('body');
- expect($('.welcome-panel h1').text()).toBe('Offline');
+ expect($('.welcome-panel h1').text()).toBe('Offline');
- done();
- } finally {
- jenkins.get = get;
- }
- });
+ done();
+ } finally {
+ jenkins.get = get;
+ }
+ });
});
it("install defaults", function (done) {
@@ -240,16 +246,16 @@ describe("pluginSetupWizard.js", function () {
});
var doit = function($, sel, trigger) {
- var $el = $(sel);
- if($el.length !== 1) {
- console.log('Not found! ' + sel);
+ var $el = $(sel);
+ if($el.length !== 1) {
+ console.log('Not found! ' + sel);
console.log(new Error().stack);
- }
- if(trigger === 'check') {
- $el.prop('checked', true);
- trigger = 'change';
- }
- $el.trigger(trigger);
+ }
+ if(trigger === 'check') {
+ $el.prop('checked', true);
+ trigger = 'change';
+ }
+ $el.trigger(trigger);
};
it("install custom", function (done) {
@@ -258,8 +264,8 @@ describe("pluginSetupWizard.js", function () {
// validate a call to installPlugins with our defaults
validatePlugins(['junit','mailer'], function() {
- // install a specific, other 'set' of plugins
- $('input[name=searchbox]').val('junit');
+ // install a specific, other 'set' of plugins
+ $('input[name=searchbox]').val('junit');
done();
});
@@ -277,7 +283,7 @@ describe("pluginSetupWizard.js", function () {
it("resume install", function (done) {
var ajaxMappings = {
- '/jenkins/updateCenter/incompleteInstallStatus': {
+ '/jenkins/updateCenter/incompleteInstallStatus': {
status: 'ok',
data: {
'junit': 'Success',
@@ -288,27 +294,27 @@ describe("pluginSetupWizard.js", function () {
}
};
test(function($) {
- expect($('.modal-title').text()).toBe('Resume Installation');
- expect($('*[data-name="junit"]').is('.success')).toBe(true);
- done();
+ expect($('.modal-title').text()).toBe('Resume Installation');
+ expect($('*[data-name="junit"]').is('.success')).toBe(true);
+ done();
}, ajaxMappings);
});
it("error conditions", function (done) {
var ajaxMappings = {
- '/jenkins/updateCenter/incompleteInstallStatus': {
+ '/jenkins/updateCenter/incompleteInstallStatus': {
status: 'error',
data: {
- 'junit': 'Success',
- 'subversion': 'Pending',
- 'other': 'Failed',
- 'mailer': 'Success'
+ 'junit': 'Success',
+ 'subversion': 'Pending',
+ 'other': 'Failed',
+ 'mailer': 'Success'
}
}
};
test(function($) {
- expect($('.error-container h1').html()).toBe('Error');
- done();
+ expect($('.error-container h1').html()).toBe('Error');
+ done();
}, ajaxMappings);
});
@@ -321,18 +327,24 @@ describe("pluginSetupWizard.js", function () {
var ajaxMappings = {
'/jenkins/updateCenter/installStatus': new LastResponse([{
status: 'ok',
- data: [] // first, return nothing by default, no ongoing install
+ data: { // first, return nothing by default, no ongoing install
+ state: 'NEW',
+ jobs: []
+ }
},
{
status: 'ok',
- data: [
- {
- name: 'subversion',
- type: 'InstallJob',
- installStatus: 'Success',
- requiresRestart: 'true' // a string...
- }
- ]
+ data: {
+ state: 'INSTALLING_PLUGINS',
+ jobs: [
+ {
+ name: 'subversion',
+ type: 'InstallJob',
+ installStatus: 'Success',
+ requiresRestart: 'true' // a string...
+ }
+ ]
+ }
}])
};
test(function($) {
@@ -340,12 +352,13 @@ describe("pluginSetupWizard.js", function () {
expect(goButton.size()).toBe(1);
// validate a call to installPlugins with our defaults
- setTimeout(function() {
+ setTimeout(function() {
expect($('.install-done').is(':visible')).toBe(false);
- expect($('.install-done-restart').is(':visible')).toBe(true);
+
+ expect($('.save-first-user').is(':visible')).toBe(true);
done();
- }, 500);
+ }, 500);
goButton.click();
}, ajaxMappings);