Skip to content

Commit

Permalink
feat(jenkins): Support for adding custom KeyStore for Jenkins clients (
Browse files Browse the repository at this point in the history
…#596)

* feat(jenkins): Support for adding custom KeyStore for Jenkins clients

```
jenkins:
  masters:
    - address: "https://jenkins.com"
      name: spinnaker
      keyStore: /path/to/keystore.p12
      keyStoreType: PKCS12
      keyStorePassword: my_keystore_password
```
or
```
jenkins:
  masters:
    - address: "https://jenkins.com"
      name: spinnaker
      keyStore: /path/to/keystore.jks
      keyStorePassword: my_keystore_password
```

* Forgot a password

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
jervi and mergify[bot] committed Jan 28, 2020
1 parent e6f05a0 commit f2fa552
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ import retrofit.RestAdapter
import retrofit.client.OkClient
import retrofit.converter.JacksonConverter

import javax.net.ssl.KeyManager
import javax.net.ssl.KeyManagerFactory
import javax.net.ssl.SSLContext
import javax.net.ssl.TrustManager
import javax.net.ssl.TrustManagerFactory
Expand Down Expand Up @@ -130,40 +132,53 @@ class JenkinsConfig {
})
}

if (host.trustStore) {
TrustManager[] trustManagers
TrustManager[] trustManagers = null
KeyManager[] keyManagers = null

if (host.trustStore) {
if (host.trustStore.equals("*")) {
trustManagers = [new TrustAllTrustManager()]
} else {
def trustStorePassword = host.trustStorePassword

def trustStore = KeyStore.getInstance(host.trustStoreType)
new File(host.trustStore).withInputStream {
trustStore.load(it, trustStorePassword.toCharArray())
}

def trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
trustManagerFactory.init(trustStore)

trustManagers = trustManagerFactory.trustManagers
}
}

if (host.keyStore) {
def keyStorePassword = host.keyStorePassword
def keyStore = KeyStore.getInstance(host.keyStoreType)
new File(host.keyStore).withInputStream {
keyStore.load(it, keyStorePassword.toCharArray())
}
def keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
keyManagerFactory.init(keyStore, keyStorePassword.toCharArray())

keyManagers = keyManagerFactory.keyManagers
}

if (trustManagers || keyManagers) {
def sslContext = SSLContext.getInstance("TLS")
sslContext.init(null, trustManagers, null);
sslContext.init(keyManagers, trustManagers, null)

client.setSslSocketFactory(sslContext.socketFactory)
}

new RestAdapter.Builder()
.setEndpoint(Endpoints.newFixedEndpoint(host.address))
.setRequestInterceptor(new RequestInterceptor() {
@Override
void intercept(RequestInterceptor.RequestFacade request) {
request.addHeader("User-Agent", "Spinnaker-igor")
requestInterceptor.intercept(request)
}
})
@Override
void intercept(RequestInterceptor.RequestFacade request) {
request.addHeader("User-Agent", "Spinnaker-igor")
requestInterceptor.intercept(request)
}
})
.setClient(new OkClient(client))
.setConverter(new JacksonConverter(getObjectMapper()))
.build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ class JenkinsProperties implements BuildServerProperties<JenkinsProperties.Jenki
String trustStoreType = KeyStore.getDefaultType()
String trustStorePassword

String keyStore
String keyStoreType = KeyStore.getDefaultType()
String keyStorePassword

Boolean skipHostnameVerification = false

Permissions.Builder permissions = new Permissions.Builder()
Expand Down

0 comments on commit f2fa552

Please sign in to comment.