Commit Graph
32590 Commits
Author SHA1 Message Date
Jesse Glick d44f85894d Trying to diagnose recent CI failures of HtmlUnit calls.
For example https://jenkins.ci.cloudbees.com/job/core/job/jenkins-core-validated-merge/38/testReport/lib.layout/LayoutTest/rejectedLinks/ failed with:
java.io.IOException: GET http://localhost:52099/jenkins/login failed
	at java.net.SocketInputStream.socketRead0(Native Method)
	at java.net.SocketInputStream.read(SocketInputStream.java:152)
	at java.net.SocketInputStream.read(SocketInputStream.java:122)
	at java.io.BufferedInputStream.fill(BufferedInputStream.java:235)
	at java.io.BufferedInputStream.read(BufferedInputStream.java:254)
	at org.apache.commons.httpclient.HttpParser.readRawLine(HttpParser.java:78)
	at org.apache.commons.httpclient.HttpParser.readLine(HttpParser.java:106)
	at org.apache.commons.httpclient.HttpConnection.readLine(HttpConnection.java:1116)
	at org.apache.commons.httpclient.MultiThreadedHttpConnectionManager$HttpConnectionAdapter.readLine(MultiThreadedHttpConnectionManager.java:1413)
	at org.apache.commons.httpclient.HttpMethodBase.readStatusLine(HttpMethodBase.java:1973)
	at org.apache.commons.httpclient.HttpMethodBase.readResponse(HttpMethodBase.java:1735)
	at org.apache.commons.httpclient.HttpMethodBase.execute(HttpMethodBase.java:1098)
	at org.apache.commons.httpclient.HttpMethodDirector.executeWithRetry(HttpMethodDirector.java:398)
	at org.apache.commons.httpclient.HttpMethodDirector.executeMethod(HttpMethodDirector.java:171)
	at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:397)
	at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:346)
	at com.gargoylesoftware.htmlunit.HttpWebConnection.getResponse(HttpWebConnection.java:101)
	at com.gargoylesoftware.htmlunit.WebClient.loadWebResponseFromWebConnection(WebClient.java:1456)
	at com.gargoylesoftware.htmlunit.WebClient.loadWebResponse(WebClient.java:1387)
	at com.gargoylesoftware.htmlunit.WebClient.getPage(WebClient.java:328)
	at com.gargoylesoftware.htmlunit.WebClient.getPage(WebClient.java:389)
	at com.gargoylesoftware.htmlunit.WebClient.getPage(WebClient.java:374)
	at org.jvnet.hudson.test.JenkinsRule$WebClient.goTo(JenkinsRule.java:1944)
	at org.jvnet.hudson.test.JenkinsRule$WebClient.goTo(JenkinsRule.java:1926)
	at lib.layout.LayoutTest.rejectedLinks(LayoutTest.java:44)
which makes little sense since the named IOException is actually thrown from HttpWebConnection.java:130.
Perhaps Surefire is not reporting the original cause correctly, conflating the wrapper’s message with the original stack trace.
As a temporary measure, printing the original stack trace to stderr if there is any.
(cherry picked from commit 3ec7e562fe)

Conflicts:
	test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
2014-09-19 16:28:56 -04:00
Jesse Glick 389a565de4 [JENKINS-10615] AbstractProjectTest.testWorkspaceLock frequently fails on jenkins.ci due to InterruptedException in HudsonTestCase.setUp.
Possibly because it is sorted after [JENKINS-15156] testGetBuildAfterGC and the test suite times out.

(cherry picked from commit 85e9e12677)
2014-09-19 16:27:32 -04:00
Jesse Glick f7840f428f Enforcing callable checking by default, with system properties to selectively or globally disable. 2014-09-19 16:09:42 -04:00
Jesse Glick a42f7667e4 Rewriting method body to more legible flow. 2014-09-19 15:49:28 -04:00
Jesse Glick 1df5ed000d @since, warnings. 2014-09-19 15:45:10 -04:00
Jesse Glick b1084f8c38 Unnecessary override. 2014-09-19 15:44:15 -04:00
Jesse Glick 52ea56abec Merge branch 'security' into SECURITY-144 2014-09-19 15:40:00 -04:00
Jesse Glick 47c254aa32 [JENKINS-19192] Using JNR 3.0.1 which includes JNR-FFI 1.0.7; 1.0.6 has the backported fix for Guava #1505, the root cause.
So this upgrade ought to prevent a recurrence of the issue in case some other code refers to JNR from the CLI.
(As yet untested, and we do not especially want to send JNR over the CLI channel anyway for performance reasons.)
2014-09-19 15:39:09 -04:00
Jesse Glick c80741615b Revert "This is failing the animal sniffer test"
This reverts commit 3e15684f75.
Not necessary after getting 5e7b844b6.
2014-09-19 15:27:05 -04:00
Jesse Glick 2d115fd60b Merge branch 'security' into SECURITY-144 2014-09-19 15:26:25 -04:00
Kohsuke Kawaguchi ae83957091 Completing the migration to Java6
(cherry picked from commit 5e7b844b65)

Conflicts:
	changelog.html
2014-09-19 15:26:07 -04:00
Kohsuke Kawaguchi 0908362899 Completing the migration to Java6
(cherry picked from commit 5e7b844b65)

Conflicts:
	changelog.html
2014-09-19 15:24:48 -04:00
Jesse Glick 8a7cd18be1 For now, at least print warnings about unmarked callables. 2014-09-19 15:23:30 -04:00
Jesse Glick 3c3c476dbf Comment. 2014-09-19 15:22:24 -04:00
Jesse Glick 4a5947d91a Merge branch 'security' into SECURITY-144 2014-09-19 15:04:32 -04:00
Jesse Glick 678e8810af Merge branch 'security' into security-rc 2014-09-19 15:04:08 -04:00
Jesse Glick c044576745 Stapler 1.218.1 was apparently never even deployed to the Maven repo, so let us just skip straight to 1.229 which has the fix and which we are using in the merged release branches anyway. 2014-09-19 15:01:58 -04:00
Jesse Glick ed624646a4 Merge branch 'security' into SECURITY-144 2014-09-19 14:46:37 -04:00
Jesse Glick 30f37b2c3a Merge branch 'security' into security-rc 2014-09-19 14:43:05 -04:00
Jesse Glick 38563d3470 @DataBoundConstructor makes no sense on an abstract class.
(cherry picked from commit 71600d8b37)
2014-09-19 14:40:52 -04:00
Jesse Glick ee9410d1d2 Merge branch 'security' into security-rc
Conflicts:
	.idea/compiler.xml
	core/pom.xml
	pom.xml
	war/pom.xml
2014-09-19 14:33:27 -04:00
Jesse Glick 7211c0d42a Merge branch 'security' into SECURITY-144
Conflicts:
	maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java
	maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/Maven31ProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/Maven3Builder.java
	maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/MavenBuildProxy.java
	maven-plugin/src/main/java/hudson/maven/MavenBuilder.java
	maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/MavenVersionCallable.java
	maven-plugin/src/main/java/hudson/maven/ProcessCache.java
	maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
	maven-plugin/src/main/java/hudson/maven/SplittableBuildListener.java
2014-09-19 14:06:56 -04:00
Jesse Glick e1d2322e69 Updated to maven-plugin 2.0 general release.
(cherry picked from commit 9b53643c7a)

Conflicts:
	pom.xml
2014-09-19 14:04:30 -04:00
Kohsuke Kawaguchi 048d759792 maven plugin is moved off to a separate repository.
See https://github.com/jenkinsci/maven-plugin

(cherry picked from commit f98070d3e6)

Conflicts:
	maven-plugin/pom.xml
	maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
	maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
	maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
	maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
	plugins/pom.xml
	pom.xml
2014-09-19 14:03:30 -04:00
Michal Srb 0a76051a47 init script: don't try to run on Java 5
Jenkins now requires at least Java 6. Version 7 and 8 should also work.
2014-09-19 13:00:56 +02:00
Kohsuke Kawaguchi 148ad489b1 Filled in the blank of FilePathFilter 2014-09-18 18:52:15 -07:00
Kohsuke Kawaguchi 7bd7e4f0b2 Fix up.
- If a write results in a file creation, do the create check, to align with the POSIX semantics.
- Don't make pointless mkdirs check if the directory already exists
- read vs readSymlink difference is dangerous because read() can be called for symlinks in other context as well.
2014-09-18 18:52:05 -07:00
Kohsuke Kawaguchi e4a1ac2ba1 Added a hook to intercept remote file access and reject them if necessary 2014-09-18 18:40:56 -07:00
Kohsuke Kawaguchi 3e15684f75 This is failing the animal sniffer test 2014-09-18 15:50:01 -07:00
Kohsuke Kawaguchi e9eb408e6f A merge failure in 1239ed3b
If you look at the log graph of this file, you'll see that 535c111 removed this line for SECURITY-76, but it's still present in 1239ed3b.

Most likely because d482fc50 edited a nearby line, and the merge conflict wasn't properly resolved.
2014-09-18 15:49:53 -07:00
Kohsuke Kawaguchi 42b36e460d Allow hudson.remoting.* callables that are used to implement lower-level functionalities
... like pipes.

IOSyncer, PingThread.Ping, RPCRequest, SetMaximumBytecodeLevel look all harmless.

PreloadJarTask is dubious, but with classloading from slave disabled, it becomes harmless.
2014-09-18 15:14:55 -07:00
Kohsuke Kawaguchi 101b4e7fd5 [SECURITY-144] Classify all the core callables one way or the other 2014-09-18 15:07:31 -07:00
Kohsuke Kawaguchi 91d3febd6d [SECURITY-144] Make annotation of anonymous Callables easier
We often create anonymous Callable types, yet anonymous class cannot be annotated.

These convenient base classes make that transition easy
2014-09-18 15:07:28 -07:00
Kohsuke Kawaguchi 12acbefca6 [FIXED SECURITY-147]
This callable allows an arbitrary file to be read from the master
2014-09-18 15:07:28 -07:00
Kohsuke Kawaguchi 79ab57ec01 [FIXED SECURITY-146]
Hide system information and diagnostics of the master from slaves
2014-09-18 15:07:27 -07:00
Kohsuke Kawaguchi 2c5666c600 [SECURITY-144] Introduced annotation to mark Callables whether they can be safely invoked from slaves 2014-09-18 15:07:14 -07:00
Kohsuke Kawaguchi 387804b7ff [SECURITY-144]
Provide opportunity to install CallableDecorators before channels are created, to ensure every callable sent gets caught
2014-09-18 10:24:21 -07:00
Jesse Glick 8aafca039d Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/security/ACL.java
	test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
2014-09-18 10:32:00 -04:00
Jesse Glick 747238d898 Merge branch 'rc' into security-rc 2014-09-18 10:29:09 -04:00
Daniel Beck cd8c8e0072 Noting #1397 2014-09-18 11:26:31 +02:00
Daniel Beck 6ce6ab3101 Merge pull request #1397 from OEP/fix-ignored-umask
Explicitly set the umask for daemon in Debian init script
2014-09-18 11:24:28 +02:00
Kohsuke Kawaguchi 67b3e64d68 Bundling new slave-installer module for better progress UI feedback 2014-09-17 17:19:32 -07:00
Kohsuke Kawaguchi a75c3cbacf [JENKINS-23665] integrated newer version of Winstone 2014-09-17 16:40:41 -07:00
Paul Kilgo 2b5890b27b remove useless call to umask 2014-09-17 19:05:35 -04:00
Kohsuke Kawaguchi c57f9ed577 [JENKINS-24458 JENKINS-11543] integrated the newer version of stapler with reduced log level 2014-09-17 15:36:58 -07:00
Paul Kilgo fdf4163550 only set umask if set in /etc/default/jenkins 2014-09-17 17:27:53 -04:00
Paul Kilgo 739b81450a Explicitly set the umask for daemon
As discovered by danielbeck in #jenkins, daemon(1) does not inherit the parent
process's umask. The --umask flag is the means to set it explicitly.
2014-09-17 17:10:49 -04:00
Jesse Glick 16cbab5e48 Better toString. builds/251 changes/251 2014-09-17 14:26:38 -04:00
CloudBees DEV@Cloud 8b2d70f60b Merge REMERGE_HEAD into HEAD 2014-09-17 14:42:17 +00:00
Daniel Beck 5e649c2403 Noting #1370, #620 2014-09-17 16:25:55 +02:00