[JENKINS-43668] - Remove Trilead references #13
Conversation
pom.xml
Outdated
| @@ -28,7 +28,7 @@ | |||
|
|
|||
| <properties> | |||
| <jenkins.version>1.580.3</jenkins.version> | |||
| <java.level>6</java.level> | |||
| <java.level>7</java.level> | |||
There was a problem hiding this comment.
Also needs bumping the core dependency then. I would propose to pick 1.625.x as a first version with Java 7
pom.xml
Outdated
| @@ -62,20 +62,20 @@ | |||
| <dependency> | |||
| <groupId>org.jenkins-ci.modules</groupId> | |||
| <artifactId>ssh-cli-auth</artifactId> | |||
| <version>1.1</version> | |||
| <version>1.4</version> | |||
There was a problem hiding this comment.
Updated.
I've just gone with the latest release version, but 1.2 would also work. Would there be any reason to stick with a lower version?
There was a problem hiding this comment.
The only potential issue is that backporting of this change (e.g. SSHD Module 1.12 or above) will also require bumping the ssh-cli-auth module. I do not see any issue with that in this case. The modules have to evolve anyway
| if (!sshKey.isAuthorizedKey(getPublicKeySignature(key))) { | ||
| LOGGER.fine("Key signature didn't match for the user: "+username+" : "+getPublicKeySignature(key)); | ||
| if (!sshKey.has(key)) { | ||
| LOGGER.fine("Key signature didn't match for the user: "+username); |
There was a problem hiding this comment.
Would it be possible to continue printing some diagnostics message from key?
There was a problem hiding this comment.
Sorry, I missed this comment. We can probably print out the whole public key, but the signature generation relies on Trilead which is what we're wanting to remove, so I'm not keen on still trying to generate a signature for logging purposes.
There was a problem hiding this comment.
Signature now retained for the log message, as requested
|
Maybe it makes sense to convert JENKINS-43610 to EPIC and to add tasks for module. But it is up to you, the current approach is fine for me if you prefer it |
oleg-nenashev
changed the title
|
Agreed on the Epic. JENKINS-43668 now covers this task |
mc1arke
changed the title
|
Should be merged without squash from what I see. |
|
I'll amend my commits later today, and will probably squash the last 3 commits into one, so I have one for fixing the local build, and one for using the new signature generation mechanism; unless anyone objects? |
| @@ -51,20 +51,20 @@ | |||
| <dependency> | |||
| <groupId>org.jenkins-ci.modules</groupId> | |||
| <artifactId>ssh-cli-auth</artifactId> | |||
| <version>1.2</version> | |||
| <version>1.4</version> | |||
There was a problem hiding this comment.
To pick up jenkinsci/ssh-cli-auth-module#2 IIUC?
[JENKINS-43610] Move to latest version of ssh-cli-auth to remove Trilead references from SSHD module