Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2015-12-09 17:56:55 -0500
committerWinston Prakash2015-12-09 18:08:56 -0500
commit03cd4a1a74fa36b2fe0a42eb5de161398fb9f4a2 (patch)
tree24f27cbf8f8fd631359209efc3eeea5e542cbefc /hudson-core/src/main/resources/hudson/model
parent6cae5b7f9f88ac0afdc13ae8ea1c2f5070441b9e (diff)
downloadorg.eclipse.hudson.core-03cd4a1a74fa36b2fe0a42eb5de161398fb9f4a2.tar.gz
org.eclipse.hudson.core-03cd4a1a74fa36b2fe0a42eb5de161398fb9f4a2.tar.xz
org.eclipse.hudson.core-03cd4a1a74fa36b2fe0a42eb5de161398fb9f4a2.zip
Bug Fix: Bug 483533 - Add security advisory to the Hudson CLI screen
Diffstat (limited to 'hudson-core/src/main/resources/hudson/model')
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/_cli.jelly47
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/_cli.properties8
2 files changed, 39 insertions, 16 deletions
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/_cli.jelly b/hudson-core/src/main/resources/hudson/model/Hudson/_cli.jelly
index d7c974ec..dcbd3751 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/_cli.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/_cli.jelly
@@ -17,19 +17,36 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
- <l:layout norefresh="true">
- <st:include page="sidepanel.jelly" />
- <l:main-panel>
- <h1>
- <img src="${imagesURL}/48x48/terminal.png" alt=""/>
- ${%Hudson CLI}
- </h1>
- <p>
- ${%blurb(rootURL)}
- </p>
- <pre style="color: white; background-color:black; padding:1em; font-weight: bold">java -jar <a
- style="color: white"
- href="jnlpJars/hudson-cli.jar">hudson-cli.jar</a> -s ${h.inferHudsonURL(request)} help</pre>
- </l:main-panel>
- </l:layout>
+ <l:layout norefresh="true">
+ <st:include page="sidepanel.jelly" />
+ <l:main-panel>
+ <h1>
+ <img src="${imagesURL}/48x48/terminal.png" alt=""/>
+ ${%Hudson CLI}
+ </h1>
+
+ <j:if test="${!app.allowCli()}">
+ <p>
+ ${%blurb3}
+ <br/>
+ <br/>
+ ${%blurb4}
+ </p>
+ </j:if>
+
+ <j:if test="${app.allowCli()}">
+ <p>
+ ${%blurb(rootURL)}
+ </p>
+ <pre style="color: white; background-color:black; padding:1em; font-weight: bold">java -jar <a
+ style="color: white"
+ href="jnlpJars/hudson-cli.jar">hudson-cli.jar</a> -s ${h.inferHudsonURL(request)} help</pre>
+ <p>
+ <b style="color:#a52a2a">
+ ${%blurb2}
+ </b>
+ </p>
+ </j:if>
+ </l:main-panel>
+ </l:layout>
</j:jelly>
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/_cli.properties b/hudson-core/src/main/resources/hudson/model/Hudson/_cli.properties
index 9c313062..fb3c8f3f 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/_cli.properties
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/_cli.properties
@@ -13,6 +13,12 @@
#**************************************************************************
blurb=You can access various features in Hudson through a command-line tool. See \
- <a href="http://wiki.hudson-ci.org/display/HUDSON/Hudson+CLI">the Wiki</a> for more details of this feature.\
+ <a href="https://wiki.eclipse.org/Using_Hudson/Command-line_interface">the Wiki</a> for more details of this feature.\
To get started, download <a href="{0}/jnlpJars/hudson-cli.jar">hudson-cli.jar</a>, and run it as follows:
+blurb2=Allowing unrestricted access through Hudson CLI from outside of a controlled environment \
+ is not recommended for security reasons.
+
+blurb3=Hudson CLI is <b>disabled</b>. Allowing unrestricted access through Hudson CLI from outside of a controlled environment \
+ is not recommended for security reasons.
+blurb4=To allow access through Hudson CLI with in a controlled environment, enable it in the Configure System page. \ No newline at end of file

Back to the top