[JENKINS-39738, JENKINS-43668] - Pick up SSHD module including sshd-core 1.6.0 #2853

jglick · 2017-04-20T23:39:52Z

Description

Integration of jenkinsci/sshd-plugin#10 & jenkinsci/sshd-plugin#17. Amends #2795, where @oleg-nenashev requested I omit the SSHD update to be on the safe side.

Changelog entries

Proposed changelog entries:

Major RFE: SSHD Module 2.0: Update from SSHD Core 0.14.0 to Apache MINA SSHD 1.6.0 in Jenkins core and Jenkins CLI
- SSH Changelogs: https://github.com/jenkinsci/sshd-module/blob/master/CHANGELOG.md#20
- Compatibility notice: https://github.com/jenkinsci/sshd-module/blob/master/CHANGELOG.md#20-compatibility-notice
RFE: JENKINS-39738 - SSHD Module 2.0: Enable aes192ctr and aes256ctr ciphers if JVM supports unlimited-strength encryption
Internal RFE: JENKINS-43668 - SSHD Module 2.0: Replace Trilead SSH-2 API usages by the built-in JVM functionality

Desired reviewers

@reviewbybees & @jenkinsci/code-reviewers

ghost · 2017-04-20T23:42:35Z

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

daniel-beck · 2017-04-23T23:24:46Z

pluginFirstClassLoader

A reminder that we still expose all core dependencies to plugins for no reason 😢

jglick · 2017-04-24T18:19:19Z

@oleg-nenashev let me know if you want this amended to pick up jenkinsci/sshd-plugin#14.

oleg-nenashev · 2017-04-25T07:40:15Z

@jglick Do you mean enabling Ciphers on the client side? It may be useful though I am not sure it is urgent to do so. But it worth creating a JIRA ticket

oleg-nenashev · 2017-04-28T13:54:31Z

On hold till we agree on the approach in #2848

oleg-nenashev · 2017-05-08T08:04:42Z

Started the thread in the MINA user list: http://www.mail-archive.com/users@mina.apache.org/msg06503.html , CC @aheritier

jglick · 2017-05-08T16:29:14Z

IIUC this is on hold pending SSHD 1.5.0 or some other resolution to a binary compatibility issue?

oleg-nenashev · 2017-05-08T16:32:00Z

@jglick Yes, the ball is on my side I'd say

oleg-nenashev · 2017-05-21T17:55:22Z

We are still blocked with this PR.

paladox · 2017-06-15T11:56:23Z

I wonder when 1.6.0 will be released. Since I presume this apache/mina-sshd@b0c5ca2 is the fix for the licensee they were talking about which was blocking 1.5.0.

oleg-nenashev · 2017-06-15T12:01:24Z

I ping them regularly

paladox · 2017-06-15T12:02:05Z

Ok thanks :)

oleg-nenashev · 2017-06-29T08:58:42Z

:(

oleg-nenashev · 2017-06-29T08:59:08Z

I could build a custom version to unblock us

paladox · 2017-06-29T14:46:00Z

@oleg-nenashev if you want and have time to do it :)

will this be for maven i.e. custom versioning it to use -jenkins prefix?

oleg-nenashev · 2017-06-29T15:25:44Z

@paladox Yes, it will be a custom jenkins-specific version in the Jenkins repo. I have offered my help to the SSHD maintainers multiple times, but seems there is no plausible ETA

oleg-nenashev

SSHD 2.0 is out, we can proceed on this PR.
https://github.com/jenkinsci/sshd-module/blob/master/CHANGELOG.md#20

oleg-nenashev · 2017-07-05T14:21:17Z

cli/pom.xml

@@ -56,7 +56,7 @@
    <dependency>
      <groupId>org.apache.sshd</groupId>
      <artifactId>sshd-core</artifactId>
-      <version>1.2.0</version> <!-- TODO 1.3.0 requires Java 8 -->
+      <version>1.4.0</version>


Should be 1.6.0

oleg-nenashev · 2017-07-05T14:21:25Z

war/pom.xml

@@ -134,7 +134,7 @@ THE SOFTWARE.
    <dependency>
      <groupId>org.jenkins-ci.modules</groupId>
      <artifactId>sshd</artifactId>
-      <version>1.11</version>
+      <version>2.0-20170425.195035-2</version> <!-- TODO -->


Please recheck.

oleg-nenashev

🐝

oleg-nenashev · 2017-07-05T20:52:32Z

@reviewbybees done

oleg-nenashev · 2017-07-06T17:06:03Z

I will update the changelogs tomorrow

oleg-nenashev · 2017-07-07T18:53:09Z

@paladox @jglick @daniel-beck Please take a look at the new changelog entries. Does it work for you? Surprisingly, I was unable to find a JIRA ticket perfectly matching the first Major RFE

paladox · 2017-07-07T20:54:38Z

@oleg-nenashev thanks, looks good to me :). Untested though, but there is not a big difference between 1.4.0 with 1.6.0 to cause big issues.

Pick up SSHD module including sshd-core 1.4.0.

5eaa33a

jglick added the needs-more-reviews Complex change, which would benefit from more eyes label Apr 20, 2017

jglick requested a review from oleg-nenashev April 20, 2017 23:39

oleg-nenashev self-assigned this Apr 21, 2017

oleg-nenashev added the work-in-progress The PR is under active development, not ready to the final review label Apr 21, 2017

jglick added 2 commits April 25, 2017 15:49

Merge branch 'master' into sshd-update

504e117

[FIXED JENKINS-39738] Picking up jenkinsci/sshd-plugin@bb69634

295536c

jglick removed the work-in-progress The PR is under active development, not ready to the final review label Apr 25, 2017

oleg-nenashev mentioned this pull request Apr 27, 2017

Bump Trilead version to receive a number of security enhancements #2848

Merged

4 tasks

paladox mentioned this pull request Apr 27, 2017

Disable eddsa temporarily jenkinsci/trilead-ssh2#19

Closed

oleg-nenashev added the on-hold This pull request depends on another event/release, and it cannot be merged right now label Apr 28, 2017

jglick added work-in-progress The PR is under active development, not ready to the final review and removed needs-more-reviews Complex change, which would benefit from more eyes labels May 8, 2017

oleg-nenashev mentioned this pull request May 19, 2017

Update to SSHD 1.6.0 jenkinsci/sshd-plugin#17

Merged

oleg-nenashev changed the title ~~Pick up SSHD module including sshd-core 1.4.0~~ Pick up SSHD module including sshd-core 1.5.0+ May 21, 2017

oleg-nenashev previously requested changes Jul 5, 2017

View reviewed changes

oleg-nenashev removed the on-hold This pull request depends on another event/release, and it cannot be merged right now label Jul 5, 2017

jglick added 2 commits July 5, 2017 10:45

Merge branch 'master' into sshd-update

0d2ec89

Picking up Apache SSHD 1.6.0 & Jenkins sshd module 2.0.

afa7f46

jglick changed the title ~~Pick up SSHD module including sshd-core 1.5.0+~~ Pick up SSHD module including sshd-core 1.6.0 Jul 5, 2017

jglick removed the work-in-progress The PR is under active development, not ready to the final review label Jul 5, 2017

jglick requested a review from oleg-nenashev July 5, 2017 14:54

jglick unassigned oleg-nenashev Jul 5, 2017

jglick added the needs-more-reviews Complex change, which would benefit from more eyes label Jul 5, 2017

oleg-nenashev approved these changes Jul 5, 2017

View reviewed changes

paladox approved these changes Jul 5, 2017

View reviewed changes

jglick added ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback and removed needs-more-reviews Complex change, which would benefit from more eyes labels Jul 5, 2017

oleg-nenashev changed the title ~~Pick up SSHD module including sshd-core 1.6.0~~ [JENKINS-39738, JENKINS-43668] - Pick up SSHD module including sshd-core 1.6.0 Jul 7, 2017

oleg-nenashev merged commit 00956ff into jenkinsci:master Jul 7, 2017

jglick deleted the sshd-update branch July 13, 2017 16:39

jglick mentioned this pull request Sep 15, 2017

[JENKINS-46512] Minimal tests update to allow PCT runs with newer bouncy-castle on classpath jenkinsci/ssh-credentials-plugin#28

Closed

jglick added a commit to jglick/ssh-credentials-plugin that referenced this pull request Nov 8, 2018

Let us at least get on SSHD 1.x by picking up jenkinsci/jenkins#2853.

b779d11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-39738, JENKINS-43668] - Pick up SSHD module including sshd-core 1.6.0 #2853

[JENKINS-39738, JENKINS-43668] - Pick up SSHD module including sshd-core 1.6.0 #2853

jglick commented Apr 20, 2017 •

edited by oleg-nenashev

Loading

ghost commented Apr 20, 2017

daniel-beck commented Apr 23, 2017

jglick commented Apr 24, 2017

oleg-nenashev commented Apr 25, 2017 •

edited

Loading

oleg-nenashev commented Apr 28, 2017

oleg-nenashev commented May 8, 2017

jglick commented May 8, 2017

oleg-nenashev commented May 8, 2017

oleg-nenashev commented May 21, 2017

paladox commented Jun 15, 2017

oleg-nenashev commented Jun 15, 2017

paladox commented Jun 15, 2017

oleg-nenashev commented Jun 29, 2017

oleg-nenashev commented Jun 29, 2017

paladox commented Jun 29, 2017

oleg-nenashev commented Jun 29, 2017

oleg-nenashev left a comment

oleg-nenashev Jul 5, 2017

oleg-nenashev Jul 5, 2017

oleg-nenashev left a comment

oleg-nenashev commented Jul 5, 2017

oleg-nenashev commented Jul 6, 2017

oleg-nenashev commented Jul 7, 2017

paladox commented Jul 7, 2017

[JENKINS-39738, JENKINS-43668] - Pick up SSHD module including sshd-core 1.6.0 #2853

[JENKINS-39738, JENKINS-43668] - Pick up SSHD module including sshd-core 1.6.0 #2853

Conversation

jglick commented Apr 20, 2017 • edited by oleg-nenashev Loading

Description

Changelog entries

Desired reviewers

ghost commented Apr 20, 2017

daniel-beck commented Apr 23, 2017

jglick commented Apr 24, 2017

oleg-nenashev commented Apr 25, 2017 • edited Loading

oleg-nenashev commented Apr 28, 2017

oleg-nenashev commented May 8, 2017

jglick commented May 8, 2017

oleg-nenashev commented May 8, 2017

oleg-nenashev commented May 21, 2017

paladox commented Jun 15, 2017

oleg-nenashev commented Jun 15, 2017

paladox commented Jun 15, 2017

oleg-nenashev commented Jun 29, 2017

oleg-nenashev commented Jun 29, 2017

paladox commented Jun 29, 2017

oleg-nenashev commented Jun 29, 2017

oleg-nenashev left a comment

Choose a reason for hiding this comment

oleg-nenashev Jul 5, 2017

Choose a reason for hiding this comment

oleg-nenashev Jul 5, 2017

Choose a reason for hiding this comment

oleg-nenashev left a comment

Choose a reason for hiding this comment

oleg-nenashev commented Jul 5, 2017

oleg-nenashev commented Jul 6, 2017

oleg-nenashev commented Jul 7, 2017

paladox commented Jul 7, 2017

jglick commented Apr 20, 2017 •

edited by oleg-nenashev

Loading

oleg-nenashev commented Apr 25, 2017 •

edited

Loading