Commit Graph
198 Commits
Author SHA1 Message Date
Stephen Connolly 2a450e5ac2 [FIXED JENKINS-37041] Ensure that detached plugins are always at least their minimum version 2016-07-28 16:09:21 +01:00
Jesse Glick 4ed803cea2 [JENKINS-36666] Defend against some fatal startup errors (#2453)
* [JENKINS-36666] Properly report the reason for a failed call to Task.getDisplayName.

* [JENKINS-36666] Even without passing fatal=false to @Initializer, recover gracefully from a LinkageError in a task.

* Comment.
2016-07-20 14:55:42 +03:00
Stephen Connolly 0203504a2c [FIXED JENKINS-36494] Switch to a try with resources form of impersonation 2016-07-07 11:46:45 +01:00
Keith Zantow 723dfca37b [FIXED JENKINS-34881] - Handle pre-configured security settings for new installs (#2364)
* [FIXED JENKINS-34881] - handle non-default security settings for new installs

* Ensure permissions

* Initial security authentication token should still follow redirects
2016-06-02 19:53:43 +02:00
kzantow 89a24abcb0 [FIX JENKINS-33663] - Upgrade wizard
Add Upgrade Wizard
Add 'replace' handlebars method in jenkins.js
Fix state transitions to follow a single basic pattern
Suggested plugins selected by default
Add an install state for INITIAL_SECURITY_SETUP
Removed duplicate setupWizard.js on page [FIX JENKINS-34676]
Exclude plugins which are already installed when determining platform
Change 'snooze' to not look like a 'close' button
Make sure unlock screen doesn't show up after new install
Add compatibility check when offering suggested plugins
More appropriate handling of security token filter
2016-05-20 09:35:16 -04:00
Andres Rodriguez 454642dafe [JENKINS-34681] Allow custom plugin managers when using war (#2323)
* [JENKINS-34681] Allow custom default plugin managers

* [JENKINS-34681] Convert remaining properties to SystemProperties.
2016-05-14 21:32:55 +02:00
Oleg Nenashev 1e6afbae3b [JENKINS-34745] - Prevent CheckUpdates PeriodicWork death if update site cert is missing (#2333)
* [JENKINS-34745] - Prevent CheckUpdates PeriodicWork death in the case of the missing update site signature

* [JENKINS-34745] - Fix typo in the validator

* [JENKINS-34745] - Fix the formatting of the validation message (cc @lanwen)
2016-05-14 14:05:35 +02:00
Oleg Nenashev fdabb52503 Merge branch 'master' into JENKINS-34755
Conflicts:
	core/src/main/java/hudson/FilePath.java
2016-05-13 23:00:17 +02:00
Oleg Nenashev ebb84da617 [JENKINS-34748] - Fix handling of dependency trees in PluginManager::addDependencies() (#2334) 2016-05-13 10:39:01 +02:00
Oleg Nenashev ce8922bd74 Merge branch 'master' into JENKINS-34755
Conflicts:
	core/src/main/java/hudson/Util.java
	core/src/main/java/hudson/WebAppMain.java
	core/src/main/java/hudson/model/Item.java
	core/src/main/java/hudson/model/Queue.java
	core/src/main/java/hudson/model/UpdateCenter.java
	core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
	core/src/main/java/hudson/slaves/NodeProvisioner.java
	core/src/main/java/jenkins/model/Jenkins.java
	core/src/main/java/jenkins/slaves/NioChannelSelector.java
	core/src/main/java/jenkins/util/xml/XMLUtils.java
2016-05-12 12:05:24 +02:00
Kohsuke Kawaguchi 75e93bed8a Merge branch 'master' of github.com:jenkinsci/jenkins
Conflicts:
	changelog.html
2016-05-11 11:46:30 -07:00
Jesse Glick c2d0a5778e Merge commit '97a0fa0d036b9d3873c9b269123020a42e7ee3e9' into security-master 2016-05-11 12:07:25 -04:00
Carlos Sanchez 3e1bc969f4 [JENKINS-34683] Do not print stack trace if plugin is missing dependencies (#2048)
[JENKINS-34683] - Do not print stack trace if plugin is missing dependencies
2016-05-09 16:34:26 +02:00
Kohsuke Kawaguchi 92c81e6aee Merge remote-tracking branch 'origin/master' into symbol 2016-05-02 08:50:27 -07:00
Kohsuke Kawaguchi f238ade13e Merge pull request #2177 from jenkinsci/2nd-reactor
Don't go through init sequence twice
2016-05-02 08:49:32 -07:00
kzantow 0c95d25c28 Fix dynamic load for disabled plugins which are enabled as part of
required dependencies; this may still have some issues in unknown cases
such as a plugin disabled, then re-enabled without restarting Jenkins
but it fixes one of the primary cases
2016-04-29 11:58:04 -04:00
Kohsuke Kawaguchi 6af569c4f0 Merge remote-tracking branch 'origin/master' into symbol
Conflicts:
	core/src/main/java/hudson/model/FreeStyleProject.java
	core/src/main/java/jenkins/model/GlobalConfigurationCategory.java
2016-04-26 16:07:09 -07:00
Jesse Glick 39f33b9bfd Merge branch 'security-stable-1.651' into security-master 2016-04-26 15:58:55 -04:00
Jesse Glick d39ccfac86 Merge branch 'security-stable-1.642' into security-stable-1.651 2016-04-26 15:58:33 -04:00
Jesse Glick 93229dfc24 Merge branch 'security-stable-1.625' into security-stable-1.642 2016-04-26 15:57:52 -04:00
Jesse Glick 97a62a9bcc Merge branch 'security-stable-1.609' into security-stable-1.625 2016-04-26 15:57:32 -04:00
Jesse Glick 53dd9046c9 Merge pull request #68 from jenkinsci-cert/SECURITY-273
[FIX SECURITY-273] Require admin permission to check update sites
2016-04-26 15:57:12 -04:00
Daniel Beck 56be107feb [FIX SECURITY-273] Require admin permission to check update sites 2016-04-25 21:06:54 +02:00
kzantow e612f4163a Merge remote-tracking branch 'primary/master' into
JENKINS-34174-plugin-download-timeout

# Conflicts:
#	core/src/main/resources/jenkins/install/pluginSetupWizard.properties
2016-04-22 10:37:18 -04:00
Daniel Beck 20d3d8a529 Merge pull request #2260 from kzantow/JENKINS-33936-links-to-wiki
[JENKINS-33936] [JENKINS-33937] add links to wiki for plugins during setup
2016-04-22 16:03:26 +02:00
kzantow 6974d2b759 JENKINS-33244 / JENKINS-34174 - retry for failed plugins & specify
download timeout
2016-04-21 17:27:36 -04:00
Kohsuke Kawaguchi 8cb24b6c13 Merge branch '2.0'
2.1 will come from the master branch going forward
2016-04-20 20:55:12 -07:00
Daniel Beck 6f8540c347 [FIX JENKINS-34094] Add access control
Also adds some API restrictions for JENKINS-33803.
2016-04-17 16:48:33 +02:00
kzantow 9622bbedbb JENKINS-33936 JENKINS-33937 - add links to wiki for plugins during setup
wizard
2016-04-13 10:55:40 -04:00
Alex Earl fcdebe56c0 Add dependency resolution to manually uploaded plugins. 2016-04-07 10:19:16 -07:00
Daniel Beck 70ee2012e9 Revert "[FIXED JENKINS-21486] Merged #2172: enforce plugin dependencies."
This reverts commit fa39668b81, reversing
changes made to be9bc0dba5.
2016-04-07 00:07:38 +02:00
Daniel Beck 37c00cf2af Merge pull request #2185 from kzantow/JENKINS-33800-initial-password-file-not-found
[JENKINS-33800] - fileNotFound exception / more accurately determine if this is an upgrade
2016-04-05 21:04:35 +02:00
Daniel Beck 425b727eac Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0
Conflicts:
	cli/pom.xml
	core/pom.xml
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/PluginManagerTest.java
	war/pom.xml
2016-04-04 23:00:39 +02:00
kzantow e8d2668fc2 Fix setup wizard cases: update wizard may show erroneously,
crash/restart during install may result in installer not completed,
ensure the user may not get locked out if they've created an admin user
but not completed the installer
2016-03-31 21:55:11 -04:00
Vincent Latombe d57db1b1f2 [JENKINS-21486] Fix plugin dependencies resolution
* Check that dependencies are enabled. A disabled optional dependency
  will not prevent a plugin from loading.
* Check versions of dependencies declared by a plugin before loading it.
  If any dependency (even optional) is older than what is required,
  then the plugin isn't loaded.

This should prevent use cases where a plugin is loaded but one of its
dependencies is too old so that :
* its @Extension annotated classes cannot be loaded, causing the full
  Jenkins to blow up with crapload of exceptions which are tedious to
  investigate to understand the root cause.
* NoSuchMethodError and the likes at runtime even though boot has
  completed.

Version check (for setups where version list is manually crafted but yet
works) can be disabled by starting Jenkins with

-Dhudson.PluginWrapper.dependenciesVersionCheck.enabled=true

Minor fixes done while implementing this change :
* Fix version parsing in PluginWrapper.Dependency
* Dynamic plugin load didn't check for disabled flag
2016-03-30 10:40:12 +02:00
Kohsuke Kawaguchi 4b8d30a100 Don't go through init sequence twice
As a part of PR 1847, 3b5424e507 introduced a second invocation to
executeReactor. This is causing a problem in that it exectes
InitMilestone progression twice. If you are looking at
Jenkins.getInitLevel() it will go through STARTED ... COMPLETED once,
then it goes back to STARTED and then go to COMPLETED again.

And this code looks bit odd anyway. Why execute a whole reactor
just to make one method invocation? But I didn't see any discussion of
this in PR 1847.

This change fixes this oddity by making this a part of the main
(and sole) initialization reactor session. It's not clear what
milestone should be the pre-requisite, but given that it's only looking
at dependency chain, PLUGINS_PREPARED should be adequate.
2016-03-26 13:10:25 -07:00
Kohsuke Kawaguchi 90ff340210 Merge remote-tracking branch 'origin/2.0' into symbol
Conflicts:
	core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
	core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
2016-03-22 10:47:20 -07:00
Kohsuke Kawaguchi e1c402889c More symbol names 2016-03-19 13:54:18 -07:00
kzantow dac7decdce Implement @jglick's idea: move implicit dependency modifications to
UpdateSite, when reading plugin metadata
2016-03-15 15:14:25 -04:00
kzantow 4e3295bb2c Address @jglick's comments: refactor ClassicPluginStrategy to use
BREAK_CYCLE, use the same getImpliedDependency method for multiple code
paths, @Restricted isMailerPresent
2016-03-15 14:17:39 -04:00
kzantow 5e8bb98ee0 JENKINS-33308 - automatically install previously bundled dependencies
for plugins that depend on old Jenkins versions
2016-03-15 10:46:18 -04:00
kzantow 5368c96404 JENKINS-30749 - make Jenkins secure out of the box:
* create initial admin user with difficult password (based on UUID)
* force login with password as security token
* force initial admin user creation
2016-03-05 18:51:02 -05:00
Daniel Beck 3624f70169 Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0
Conflicts:
	cli/pom.xml
	core/pom.xml
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/cli/CreateNodeCommandTest.java
	test/src/test/java/hudson/cli/DeleteNodeCommandTest.java
	test/src/test/java/hudson/cli/GetNodeCommandTest.java
	test/src/test/java/hudson/cli/OnlineNodeCommandTest.java
	test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
	war/pom.xml
2016-02-22 13:22:37 +01:00
Daniel Beck 17edeb4829 [FIX SECURITY-250] Restrict access to admin APIs 2016-02-15 03:48:25 +01:00
Stephen Connolly 566def3bd6 [JENKINS-32765] Fix failing tests 2016-02-04 17:12:10 +00:00
Stephen Connolly bdb3c0c6d5 [JENKINS-32765] As I am not *adding* a new import, I will annotate with @CheckForNull
Of course the import being used is in a package name that is reserved for artifacts produced by a JSR... and the JSR that the dependency is claiming to come from has not actually published anything... thus whoever produced the artifact has broken the JSR policy... and it is also not safe for us to actually use these annotations as we do not know what a JSR may change on the road to actually providing this... but that is a war for a different PR
2016-02-04 15:35:41 +00:00
Stephen Connolly c0cbff7297 [JENKINS-32765] Perhaps it makes more sense to make this a property of the PluginManager rather than the classic strategy
- Also expose via servlet context parameter of same name to allow multiple instances of Jenkins in the same servlet container to have different directories
- As we are no longer a constant, change the system property to camelCase
2016-02-04 14:40:44 +00:00
Tom Fennelly f9e1fe1421 Fixups to PluginManager - getActiveInstance 2016-01-22 11:07:38 +00:00
tfennelly 036a8e94ed [FIX JENKINS-9598] Add plugin selection wizard on first launch
Also ... unbundling of plugins from Jenkins core.
2016-01-20 10:54:32 +00:00
Johannes Ernst ec92ff2f59 Merge branch 'master' of https://github.com/jenkinsci/jenkins into updates 2015-12-10 03:12:42 +00:00