Mon, 15 Jun 2009 09:16:45 -0700
+
hudson (1.309) unstable; urgency=low
* See http://hudson.dev.java.net/changelog.html for more details.
diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml
index ab89c0f55972ea4d34cd74777d7cb00e88cff342..d772c491773d5974f278733b6b3065bc4a80c41d 100644
--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.310-SNAPSHOT
+ 1.311-SNAPSHOT
../pom.xml
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index b6ae241e0977b94ab3efc79de13531a8cb6061fc..b212d1c01eabeb39c0b0b205f651c2e8a7da7a7f 100644
--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.310-SNAPSHOT
+ 1.311-SNAPSHOT
../pom.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 66cc96958d4df8c1b4f92e3f57a9d67fabfed508..d56b12cfdd967374b577f0204122d8ac475be877 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.310-SNAPSHOT
+ 1.311-SNAPSHOT
maven-plugin
diff --git a/pom.xml b/pom.xml
index 79b002cf75b911dcb0b1d4e9a5d6d1ad839be3bf..d99fd9663a720c9f4ebd7949b1c7c74b3713d3fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.310-SNAPSHOT
+ 1.311-SNAPSHOT
pom
Hudson main module
diff --git a/remoting/pom.xml b/remoting/pom.xml
index f8681db098dc6161d44ef8a9a3c8b5d24b3949af..7dacaca1871315d62f387a25f6b789b4e3d79476 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.310-SNAPSHOT
+ 1.311-SNAPSHOT
../pom.xml
diff --git a/test/pom.xml b/test/pom.xml
index f6ef84764e38ccd489142327acf59e7c067ee79a..1bc26c44791a991d54d7d6318c738a94112375ef 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
pom
org.jvnet.hudson.main
- 1.310-SNAPSHOT
+ 1.311-SNAPSHOT
4.0.0
org.jvnet.hudson.main
diff --git a/war/pom.xml b/war/pom.xml
index cd68913ced7f107c21e0b6ae3b9463417fa7d680..12e7421c2d95c9db84732fdf025232c4621f0e64 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.310-SNAPSHOT
+ 1.311-SNAPSHOT
../pom.xml
@@ -248,6 +248,7 @@ THE SOFTWARE.
+ python2.5
../ips/proto.py
diff --git a/war/resources/help/security/csrf/field.html b/war/resources/help/security/csrf/field.html
new file mode 100644
index 0000000000000000000000000000000000000000..cb6dc75fe588ba9647824b2d92d8ab63ab8168c7
--- /dev/null
+++ b/war/resources/help/security/csrf/field.html
@@ -0,0 +1,4 @@
+
+ This is name of the request parameter Hudson will look in for a crumb
+ value.
+
\ No newline at end of file
diff --git a/war/resources/help/security/csrf/salt.html b/war/resources/help/security/csrf/salt.html
new file mode 100644
index 0000000000000000000000000000000000000000..fb20b96e49e3dbe9002bc9141238ef8cb236c20d
--- /dev/null
+++ b/war/resources/help/security/csrf/salt.html
@@ -0,0 +1,8 @@
+
+ The salt value is taken as an input to the crumb generation algorithm. It acts
+ as further randomization to complicate dictionary style attacks against the
+ algorithm. In the context of CSRF exploits against Hudson servers, each Hudson
+ server should use a different salt value. If multiple Hudson servers all use
+ a crumb generation algorithm that gets broken, the salt prevents an attacker
+ from running CSRF exploits against all these servers.
+