[JENKINS-40700] Enhance slave protocol descriptions

Relates to [JENKINS-40700]. The updated displayNames describe the protocols by using similar verbiage from: core/src/main/resources/hudson/cli/CliProtocol/description.jelly core/src/main/resources/hudson/cli/CliProtocol2/description.jelly core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.jelly core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.jelly core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.jelly core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.jelly At a high level, I wanted to expose to the user, from a security perspective, whether or not the protocols were secure and how.
jenkinsci · Dec 27, 2016 · 5f67d90 · 5f67d90
1 parent 7c2e1b2
commit 5f67d90
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/core/src/main/resources/hudson/cli/CliProtocol/description.jelly b/core/src/main/resources/hudson/cli/CliProtocol/description.jelly
@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
-  ${%Accepts connections from CLI clients}
+  ${%Accepts connections from CLI clients.  This protocol is insecure.}
 </j:jelly>
diff --git a/core/src/main/resources/hudson/cli/CliProtocol2/description.jelly b/core/src/main/resources/hudson/cli/CliProtocol2/description.jelly
@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
-  ${%Extends the version 1 protocol by adding transport encryption}
+  ${%Extends the version 1 protocol by adding transport encryption.}
 </j:jelly>
diff --git a/core/src/main/resources/hudson/cli/Messages.properties b/core/src/main/resources/hudson/cli/Messages.properties
@@ -94,5 +94,5 @@ OfflineNodeCommand.ShortDescription=Stop using a node for performing builds temp
 WaitNodeOnlineCommand.ShortDescription=Wait for a node to become online.
 WaitNodeOfflineCommand.ShortDescription=Wait for a node to become offline.
 
-CliProtocol.displayName=Jenkins CLI Protocol/1
-CliProtocol2.displayName=Jenkins CLI Protocol/2
+CliProtocol.displayName=Jenkins CLI Protocol/1 (insecure)
+CliProtocol2.displayName=Jenkins CLI Protocol/2 (transport encryption)
diff --git a/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.jelly b/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.jelly
@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
-  ${%Accepts connections from remote clients so that they can be used as additional build agents}
+  ${%Accepts connections from remote clients so that they can be used as additional build agents.  This protocol is insecure.}
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.jelly b/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.jelly
@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
-  ${%Extends the version 1 protocol by adding a per-client cookie, so that we can detect a reconnection from the agent and take appropriate action}
+  ${%Extends the version 1 protocol by adding a per-client cookie, so that we can detect a reconnection from the agent and take appropriate action.  This protocol is insecure.}
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.jelly b/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.jelly
@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
-  ${%Extends the version 2 protocol by adding basic encryption but requires a thread per client}
+  ${%Extends the version 2 protocol by adding basic encryption but requires a thread per client.  This protocol falls back to Java Web Start Agent Protocol/2 (insecure) when it can't create a secure connection.}
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/slaves/Messages.properties b/core/src/main/resources/jenkins/slaves/Messages.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-JnlpSlaveAgentProtocol.displayName=Java Web Start Agent Protocol/1
-JnlpSlaveAgentProtocol2.displayName=Java Web Start Agent Protocol/2
-JnlpSlaveAgentProtocol3.displayName=Java Web Start Agent Protocol/3
-JnlpSlaveAgentProtocol4.displayName=Java Web Start Agent Protocol/4
+JnlpSlaveAgentProtocol.displayName=Java Web Start Agent Protocol/1 (insecure)
+JnlpSlaveAgentProtocol2.displayName=Java Web Start Agent Protocol/2 (insecure)
+JnlpSlaveAgentProtocol3.displayName=Java Web Start Agent Protocol/3 (basic encryption)
+JnlpSlaveAgentProtocol4.displayName=Java Web Start Agent Protocol/4 (TLS encryption)