Commit Graph
171 Commits
Author SHA1 Message Date
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
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 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
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
Jesse Glick 04e522fb03 Merge branch 'security-stable-1.625' into security-master 2015-11-25 15:31:12 -05:00
Jesse Glick 6e50702a05 Merge branch 'security-stable-1.609' into security-stable-1.625 2015-11-25 15:29:30 -05:00
Daniel Beck 40a28999e2 [FIX SECURITY-225] Add RequirePOST annotations 2015-11-15 21:07:06 +01:00
tfennelly a8e83c3c2d Tweaks based on review comments 2015-10-06 09:44:11 +01:00
tfennelly 83a8d54904 Noisy warning if restart is required 2015-10-02 17:53:47 +01:00
tfennelly 3b5424e507 Only allow disable or uninstall when all dependants or dependencies are disabled/enabled 2015-10-01 16:35:05 +01:00
Daniel Beck 2c0d1a1fdb Fix at-since from PR #1788 2015-08-25 00:08:47 +02:00
Sam Van Oort 80abb98640 Merge PR #1788: Make plugin manager pluggable
Squashed commit of the following:

commit f2c6ad272f
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Thu Aug 20 18:28:09 2015 -0400

    After much discussion, just remove the helper method to let a plugin manager override easily get instance of the PluginManager

commit a96f933d8d
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Thu Aug 20 16:59:07 2015 -0400

    Add javadocs and restrict access on the PluginManagerStaplerOverride getManager method

commit 7e1facf887
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Thu Aug 20 12:50:47 2015 -0400

    Simplify plugin manager test using @TestExtension

commit b9f2841f6d
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Thu Aug 20 10:32:49 2015 -0400

    Modify the Since version for pluginmanager overrides

commit 3af45ce579
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Thu Aug 20 10:28:14 2015 -0400

    Add test for PluginManagerStaplerOverride

commit 7864094565
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Mon Aug 17 20:59:33 2015 -0400

    Changes from review, mostly comments and rename of class

commit 1c23f086ec
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Mon Aug 17 12:58:07 2015 -0400

    Cleanup for PluginManager extensibility/UI overrides

commit e105a13bcf
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Fri Aug 14 15:23:07 2015 -0400

    Different approach to plugin manager UX pluggability, using Extension and StaplerOverridable

commit 81f21fba08
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Thu Aug 13 21:32:45 2015 -0400

    Initial round of changes to allow  overriding PluginManager

    This includes renaming the setTarget method to setUIProxy and defining an interface to retain APIs
    Fields have not been mapped through yet as that is still in progress
    Also, an AbstractStaplerUIProxy has been defined to delegate Stapler bound calls to the pluginManager

commit eeef666de7
Author: Sam Van Oort <samvanoort@gmail.com>
Date:   Wed Aug 5 17:40:50 2015 -0400

    Make plugin manager pluggable
2015-08-24 23:39:51 +02:00
David Hoover 1709ed3a2e Add @Deprecated annotations to things documented as @deprecated. 2015-04-19 14:50:12 -07:00
Jesse Glick f60bde00ab Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/PluginManager.java
	core/src/test/java/hudson/PluginManagerTest.java
2015-02-27 13:50:21 -05:00
James Nord b8c9841c30 [SECURITY-167] Plugin manager was also vulnerable.
Although the plugiun manager was vulnerable getting information
out of Jenkins was harder - however it would still be possible to
do bad things such as reading from /dev/zero on Linux
2015-02-27 18:18:23 +00:00
Jesse Glick d00f7ab9b6 Removed DownloadSettings.checkSignature; back to using a plain system property for this.
(cherry picked from commit df9c92e461)
2015-01-09 15:16:44 -05:00
Jesse Glick 33d88c015c [FIXED JENKINS-19081] Offer the option of downloading metadata directly from the server.
(cherry picked from commit 1ac77750e9)

Conflicts:
	core/src/main/java/hudson/model/DownloadService.java
	core/src/main/java/hudson/model/UpdateSite.java
2015-01-09 15:15:02 -05:00
Kohsuke Kawaguchi f7389c5b6d report the version number as well 2014-12-16 15:46:51 -08:00
Jesse Glick c94c1716f3 Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
	core/src/main/java/hudson/PluginManager.java
	core/src/main/java/hudson/PluginWrapper.java
2014-10-17 10:59:32 -04:00
Kohsuke Kawaguchi 19f9b63d74 [FIXED JENKINS-24046]
Warn users if the pinning is preventing Jenkins from overwriting older versions with bundled versions.
2014-10-16 18:18:25 -07:00
Jesse Glick cd33cdd8b7 [FIXED JENKINS-24309] Caching class loads and misses from UberClassLoader. 2014-08-18 15:36:56 -04:00
Jesse Glick 4a98beaf64 Using ExtensionList.lookup consistently. 2014-08-04 15:55:22 -04:00
Oleg Nenashev 19f4cbcce1 Merge pull request #1242 from daniel-beck/JENKINS-20031
[FIXED JENKINS-20031] Useful error message when UC not found
2014-06-01 01:27:58 -07:00
Jesse Glick 7f856b5608 [FIXED JENKINS-12753] Added PluginStrategy.getShortName to avoid actually trying to unpack a plugin before throwing RestartRequiredException. 2014-05-20 12:57:47 -04:00
Daniel Beck a4b63d2dc0 [FIXED JENKINS-20031] Useful error message when UC not found 2014-05-19 22:27:39 +02:00
Oliver Gondža f76eca4ee8 [FIXED JENKINS-22553] Do not expose plugin list that can be a subject of modification 2014-04-10 00:33:50 +02:00
Jesse Glick 56b360d6f3 [JENKINS-19976] Touch-ups to PR #1054. 2014-03-24 10:10:52 -04:00
Jesse Glick df8df45c27 [FIXED JENKINS-19976] Merged #1054: fix class loading from dynamically installed optional dependencies. 2014-03-24 09:52:32 -04:00
Jesse Glick df9c92e461 Removed DownloadSettings.checkSignature; back to using a plain system property for this. 2014-03-17 12:48:24 -04:00