Oliver Gondža
58a41bcb18
[FIXED JENKINS-26684] Escape special chars in maven build step arguments
2015-02-08 14:26:14 +01:00
Oliver Gondža
fae41b01c9
[JENKINS-26684] Reproduce in unittest.
2015-02-08 14:26:13 +01:00
Daniel Beck
27dbc6bc58
Merge pull request #1483 from pwielgolaski/JENKINS-25953
...
[FIXED JENKINS-25953]Tabs in job view are layouted in wrong way
2015-02-07 21:51:22 +01:00
Jesse Glick
7f51765a59
Merge branch 'security' into security-rc
...
Conflicts:
test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
2015-02-07 11:37:16 -05:00
Jesse Glick
9285ed86a2
Merge branch 'security' into security-stable-1.596
...
Conflicts:
test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
2015-02-07 11:29:29 -05:00
Jesse Glick
d6d127d637
Merge branch 'security' into security-stable-1.580
...
Conflicts:
test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
2015-02-07 11:28:06 -05:00
Jesse Glick
be06d6c4b8
Merge pull request #11 from jenkinsci-cert/SECURITY-162
...
[SECURITY-162] Forbid symlink attacks from artifact archiving
2015-02-07 11:25:08 -05:00
Nicolas De Loof
901194ae77
make $class and kind mutually exclusive
...
Use kind when descriptor.id != descriptor.clazz.name and $clazz otherwise.
2015-02-07 15:40:54 +01:00
Jesse Glick
35b97d451c
Merge branch 'security' into security-rc
...
Conflicts:
core/src/main/java/hudson/model/Api.java
test/src/test/java/hudson/model/ApiTest.java
2015-02-06 17:31:49 -05:00
Jesse Glick
842e6d8eca
Merge branch 'security' into security-stable-1.596
...
Conflicts:
core/src/main/java/hudson/model/Api.java
2015-02-06 17:25:13 -05:00
Jesse Glick
ade1d43664
Merge branch 'security' into security-stable-1.580
...
Conflicts:
core/src/main/java/hudson/model/Api.java
2015-02-06 17:24:01 -05:00
Robert Sandell
1887656c11
Merge pull request #9 from jenkinsci-cert/SECURITY-165
...
[SECURITY-165] blacklist the document xpath function for use in Api
2015-02-06 18:18:30 +01:00
Jesse Glick
1bba1ac3c6
[SECURITY-162] Capture the root directory in VirtualFile.forFile and reject attempts to escape it.
2015-02-06 11:37:24 -05:00
Robert Sandell
c03afbbd4f
Moved new class to other package
2015-02-06 14:52:20 +01:00
Robert Sandell
1629a93fbc
Tidy up
...
Review comments fixed:
Added license header
Reformat the issue comment
Restricted NoExternalUse
toLowerCase in English locale
lesser resolution of declared exception from the test
2015-02-06 10:34:41 +01:00
Jesse Glick
6fe334cc31
Merge branch 'security' into security-rc
...
Conflicts:
test/src/test/java/hudson/tasks/BuildTriggerTest.java
2015-02-05 21:32:01 -05:00
Jesse Glick
7288fea488
Merge branch 'security' into security-stable-1.596
...
Conflicts:
test/src/test/java/hudson/tasks/BuildTriggerTest.java
2015-02-05 21:31:26 -05:00
Jesse Glick
0af6f66c26
Merge branch 'security' into security-stable-1.580
...
Conflicts:
test/src/test/java/hudson/tasks/BuildTriggerTest.java
2015-02-05 21:30:39 -05:00
Jesse Glick
57d2b5382b
Merge pull request #8 from jenkinsci-cert/testConfigureDownstreamProjectSecurity-RandomlyFails
...
@RandomlyFails
2015-02-05 21:27:55 -05:00
Nicolas De Loof
6a8ce6ca09
deprecated find(string) and introduce explicit methods
...
to lookup descriptor by id or by Describable class name
2015-02-06 00:44:16 +01:00
Jesse Glick
b237a41af4
Also checking DirectoryBrowserSupport behavior, as in DirectoryBrowserSupportTest.
2015-02-05 18:42:54 -05:00
Jesse Glick
b72246edb1
outsideSymlinks
2015-02-05 18:30:16 -05:00
Jesse Glick
0b96005f60
Merge branch 'security' into security-rc
2015-02-05 17:47:47 -05:00
Jesse Glick
ac0db088c0
Merge branch 'security' into security-stable-1.596
2015-02-05 17:47:39 -05:00
Jesse Glick
c9836e7552
Merge branch 'security' into security-stable-1.580
2015-02-05 17:47:32 -05:00
Ryan Campbell
3e40c6fa00
Merge pull request #10 from jenkinsci-cert/SECURITY-166
...
[SECURITY-166] Make UI tests work across Jenkins versions
2015-02-05 16:39:50 -06:00
Jesse Glick
6ad8cbfc3a
Merge branch 'security' into security-rc
...
Conflicts:
core/src/main/java/hudson/ClassicPluginStrategy.java
core/src/main/java/hudson/cli/AddJobToViewCommand.java
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
core/src/main/java/jenkins/model/IdStrategyDescriptor.java
core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
core/src/main/resources/hudson/model/FileParameterValue/value_pt_BR.properties
core/src/main/resources/hudson/model/Job/index.jelly
core/src/main/resources/hudson/model/TextParameterDefinition/config_pt_BR.properties
core/src/main/resources/hudson/node_monitors/Messages_cs.properties
core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
core/src/main/resources/hudson/slaves/CommandConnector/config_pt_BR.properties
core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
core/src/main/resources/jenkins/diagnosis/HsErrPidList/index_pt_BR.properties
core/src/main/resources/jenkins/model/IdStrategy/config.jelly
core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
core/src/main/resources/jenkins/model/Jenkins/load-statistics_pt_BR.properties
core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
core/src/main/resources/jenkins/triggers/Messages_fr.properties
core/src/main/resources/lib/form/class-entry.jelly
core/src/main/resources/lib/form/helpLink_pt_BR.properties
core/src/main/resources/lib/form/link.jelly
core/src/main/resources/lib/hudson/project/configurable.properties
core/src/main/resources/lib/hudson/project/configurable_bg.properties
core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
core/src/main/resources/lib/hudson/project/configurable_eu.properties
core/src/main/resources/lib/hudson/project/configurable_gl.properties
core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
core/src/main/resources/lib/hudson/project/configurable_nl.properties
core/src/main/resources/lib/hudson/project/configurable_tr.properties
core/src/main/resources/lib/hudson/project/console-link.jelly
core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
core/src/main/resources/lib/layout/pane_de.properties
core/src/main/resources/lib/layout/pane_pt.properties
core/src/main/resources/lib/layout/pane_pt_BR.properties
core/src/main/resources/lib/layout/task_pt.properties
core/src/test/java/hudson/util/XStream2Test.java
pom.xml
test/pom.xml
test/src/test/java/hudson/model/AbstractItemSecurityTest.java
test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
war/src/main/webapp/scripts/msie.js
2015-02-05 16:35:57 -05:00
Jesse Glick
253762ac34
Merge branch 'security' into security-stable-1.596
...
Conflicts:
core/src/main/java/hudson/ClassicPluginStrategy.java
core/src/main/java/hudson/cli/AddJobToViewCommand.java
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
core/src/main/java/jenkins/model/IdStrategyDescriptor.java
core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
core/src/main/resources/hudson/model/FileParameterValue/value_pt_BR.properties
core/src/main/resources/hudson/model/Job/index.jelly
core/src/main/resources/hudson/model/TextParameterDefinition/config_pt_BR.properties
core/src/main/resources/hudson/node_monitors/Messages_cs.properties
core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
core/src/main/resources/hudson/slaves/CommandConnector/config_pt_BR.properties
core/src/main/resources/jenkins/diagnosis/HsErrPidList/index_pt_BR.properties
core/src/main/resources/jenkins/model/IdStrategy/config.jelly
core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
core/src/main/resources/jenkins/model/Jenkins/load-statistics_pt_BR.properties
core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.jelly
core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
core/src/main/resources/jenkins/triggers/Messages_fr.properties
core/src/main/resources/lib/form/helpLink_pt_BR.properties
core/src/main/resources/lib/form/link.jelly
core/src/main/resources/lib/hudson/project/configurable.properties
core/src/main/resources/lib/hudson/project/configurable_bg.properties
core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
core/src/main/resources/lib/hudson/project/configurable_eu.properties
core/src/main/resources/lib/hudson/project/configurable_gl.properties
core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
core/src/main/resources/lib/hudson/project/configurable_nl.properties
core/src/main/resources/lib/hudson/project/configurable_tr.properties
core/src/main/resources/lib/hudson/project/console-link.jelly
core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
core/src/main/resources/lib/layout/pane_de.properties
core/src/main/resources/lib/layout/pane_pt.properties
core/src/main/resources/lib/layout/pane_pt_BR.properties
core/src/main/resources/lib/layout/task_pt.properties
pom.xml
test/pom.xml
test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
war/src/main/webapp/scripts/msie.js
2015-02-05 16:31:36 -05:00
Jesse Glick
f3fe83803d
Merge branch 'security' into security-stable-1.580
...
Conflicts:
core/src/main/java/hudson/ClassicPluginStrategy.java
core/src/main/java/hudson/cli/AddJobToViewCommand.java
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
core/src/main/java/jenkins/model/IdStrategyDescriptor.java
core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
core/src/main/resources/hudson/model/Job/index.jelly
core/src/main/resources/jenkins/model/IdStrategy/config.jelly
core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.jelly
core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_es.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_sv_SE.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
core/src/main/resources/lib/form/link.jelly
core/src/main/resources/lib/hudson/failed-test_pt_BR.properties
core/src/main/resources/lib/hudson/project/configurable.properties
core/src/main/resources/lib/hudson/project/configurable_bg.properties
core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
core/src/main/resources/lib/hudson/project/configurable_eu.properties
core/src/main/resources/lib/hudson/project/configurable_gl.properties
core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
core/src/main/resources/lib/hudson/project/configurable_it.properties
core/src/main/resources/lib/hudson/project/configurable_nl.properties
core/src/main/resources/lib/hudson/project/configurable_sl.properties
core/src/main/resources/lib/hudson/project/configurable_tr.properties
core/src/main/resources/lib/hudson/project/console-link.jelly
core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
core/src/main/resources/lib/layout/breadcrumbBar_pt.properties
core/src/main/resources/lib/layout/layout_pt.properties
core/src/main/resources/lib/layout/main-panel_pt.properties
core/src/main/resources/lib/layout/pane_de.properties
core/src/main/resources/lib/layout/pane_pt.properties
core/src/main/resources/lib/layout/pane_pt_BR.properties
core/src/main/resources/lib/layout/progressiveRendering_pt.properties
core/src/main/resources/lib/layout/task_pt.properties
pom.xml
test/pom.xml
test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
war/src/main/webapp/scripts/msie.js
2015-02-05 16:27:47 -05:00
Oliver Gondža
17baaf7151
Merge pull request #1565 from olivergondza/fix-windows-tests
...
Fix few tests on windows
2015-02-05 22:13:55 +01:00
Jesse Glick
a001f71ded
Merge pull request #6 from jenkinsci-cert/SECURITY-125
...
[SECURITY-125] Matrix project script security
2015-02-05 15:44:47 -05:00
Oliver Gondža
c0bda98396
Refactor ProjectTest#testGetRelationship
2015-02-05 21:32:44 +01:00
Oliver Gondža
cb5845db29
Fix ProjectTest#testGetRelationship for Windows
2015-02-05 21:19:04 +01:00
Oliver Gondža
07ecd9e1bf
Broken .bat script in LauncherTest#overwriteSystemEnvVars
2015-02-05 21:19:04 +01:00
Ryan Campbell
29f59e42ae
[SECURITY-166] Make UI tests work across Jenkins versions
2015-02-05 13:45:33 -06:00
Robert Sandell
de4414cbf3
[SECURITY-165] blacklist the document xpath function for use in Api
2015-02-05 20:37:57 +01:00
Oleg Nenashev
25aeb94e8f
Merge pull request #1564 from hayderimran7/patch-1
...
Update README with minor grammatical fix
2015-02-05 21:18:47 +03:00
Imran Hayder
d44f2aee66
Update README with minor grammatical fix
...
Removed an extra 'of' in line#5 to fix the sentence structure.
BEFORE: 'and a number of other "of" contributors
PROPOSED: and a number of other contributors
2015-02-05 10:13:37 -08:00
James Nord
5564a62eb6
Merge pull request #7 from jenkinsci-cert/SECURITY-167_2
...
[SECURITY-167] Followup tweaks to address review comments.
2015-02-05 16:19:14 +00:00
Jesse Glick
10fbe7f1cb
Miscellaneous updates in preparation for merge to trunk.
2015-02-05 10:29:05 -05:00
Jesse Glick
dff4beb641
@RandomlyFails
2015-02-05 10:09:08 -05:00
James Nord
fe5077e534
remove uneeded "@since TODO"
2015-02-05 14:45:35 +00:00
Ryan Campbell
1338e661aa
Merge pull request #5 from jenkinsci-cert/SECURITY-166
...
Fixes for SECURITY-166
2015-02-05 08:44:51 -06:00
James Nord
1786daa514
[SECURITY-167] Followup tweaks to address review comments.
...
Addresses some comments received after the original fix was merged.
2015-02-05 14:36:29 +00:00
Jesse Glick
1d9e1d473a
Merge branch 'security' into security-rc
2015-02-05 09:07:08 -05:00
Jesse Glick
1ec6abe681
Merge branch 'security' into security-stable-1.596
2015-02-05 09:07:01 -05:00
Jesse Glick
5195aff2db
Merge branch 'security' into security-stable-1.580
2015-02-05 09:06:53 -05:00
Jesse Glick
76ff1034a9
Avoid duplicate class conflict with core/src/test/java/hudson/model/AbstractItemTest.java.
2015-02-05 09:05:06 -05:00
Jesse Glick
5c2ac6f50e
Merge branch 'security' into security-rc
...
Conflicts:
core/src/main/java/hudson/model/AbstractItem.java
core/src/main/resources/hudson/model/Messages.properties
2015-02-05 08:54:50 -05:00
Jesse Glick
1de59c936c
Merge branch 'rc' into security-rc
2015-02-05 08:54:16 -05:00