summaryrefslogtreecommitdiffstats
path: root/controller-api/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-024-3/+89
|\
| * Support Athenz authentication through x509 certificatesBjørn Christian Seime2017-12-181-1/+1
| |
| * Make NToken optional in AthenzPrincipalBjørn Christian Seime2017-12-181-2/+7
| |
| * Verify that certificate is not a role certificateBjørn Christian Seime2017-12-181-1/+9
| |
| * Move logic from determing Athenz identity from x509 certificate to AthenzUtilsBjørn Christian Seime2017-12-182-15/+21
| |
| * Add hostname verifier that verifies CN in Athenz x509 certificatesBjørn Christian Seime2017-12-151-0/+55
| |
| * Add utility method to create Athenz identity from stringBjørn Christian Seime2017-12-151-0/+12
| |
* | Split Zones and renamed itJon Marius Venstad2017-12-166-60/+77
| |
* | Changes to Zones, a MockZones and some usagesJon Marius Venstad2017-12-153-14/+80
| |
* | Moved ZoneId to controller-api and added ZonesJon Marius Venstad2017-12-145-5/+121
|/
* Optional<Duration> againJon Marius Venstad2017-12-141-2/+2
|
* Correct deprecation messageJon Marius Venstad2017-12-121-1/+1
|
* Need new classes for hosted compilationJon Marius Venstad2017-12-124-0/+72
|\
| * Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-121-0/+14
| | | | | | | | | | | | The provided SSLContext is configured with a keystore containing the Athenz service certificate and a trust store containing the Athenz CA certificates.
| * Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-123-0/+58
| |
| * Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient"Arnstein Ressem2017-12-114-72/+0
| |
| * Merge pull request #4385 from vespa-engine/bjorncs/retrieve-athenz-tls-certBjørn Christian Seime2017-12-114-0/+72
| |\ | | | | | | Add getIdentityCertificate and getRoleCertificate to ZtsClient
| | * Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-111-0/+14
| | | | | | | | | | | | | | | | | | The provided SSLContext is configured with a keystore containing the Athenz service certificate and a trust store containing the Athenz CA certificates.
| | * Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-073-0/+58
| | |
* | | Added new secure config server uri stuffJon Marius Venstad2017-12-121-1/+8
| | |
* | | Reintroduced Optional for default region and made mock consistentJon Marius Venstad2017-12-122-3/+3
| | |
* | | DeploymentId beautificationJon Marius Venstad2017-12-121-25/+23
| | |
* | | Fix mock, move kibana stuff to hosted and add some docJon Marius Venstad2017-12-121-4/+21
| | |
* | | More simplificationsJon Marius Venstad2017-12-111-1/+2
| | |
* | | Removed two pointless Optional<> and replaced more (Env, Reg) with ZoneIdJon Marius Venstad2017-12-111-3/+3
| | |
* | | Replaced ZoneId getZone(ZoneId zoneId) with hasZone(ZoneId zoneId)Jon Marius Venstad2017-12-111-2/+2
|/ /
* | Need to change new code as wellJon Marius Venstad2017-12-113-10/+16
|\ \
| * | value() -> data()Martin Polden2017-12-082-3/+3
| | |
| * | Ensure that global DNS always points to assigned rotationMartin Polden2017-12-082-7/+13
| | |
* | | Remove unused ZoneIdJon Marius Venstad2017-12-081-13/+0
| | |
* | | Extract superclass with environment and regionJon Marius Venstad2017-12-083-10/+10
|/ /
* / Update name service interfaceMartin Polden2017-12-065-14/+129
|/
* Merge pull request #4365 from ↵Morten Tokle2017-12-0617-0/+496
|\ | | | | | | | | vespa-engine/bjorncs/move-athenz-api-to-controller-api Bjorncs/move athenz api to controller api
| * Add class for Athenz role tokenBjørn Christian Seime2017-12-061-0/+36
| |
| * Move all Athenz API classes to controller-apiBjørn Christian Seime2017-12-0616-0/+460
| | | | | | | | Add package-info with ExportPackage as well.
* | Merge pull request #4359 from vespa-engine/freva/remove-context-from-proxyBjørn Christian Seime2017-12-061-10/+4
|\ \ | |/ |/| Remove Context from proxy methods
| * Remove Context from proxy methodsValerij Fredriksen2017-12-051-10/+4
| |
* | Revert "Replace usage of KeyService with SecretStore"Arnstein Ressem2017-12-053-0/+36
|/
* Merge pull request #4349 from vespa-engine/mortent/remove-keyserviceMorten Tokle2017-12-053-36/+0
|\ | | | | Replace usage of KeyService with SecretStore
| * Replace usage of KeyService with SecretStoreMorten Tokle2017-11-303-36/+0
| |
* | Add removeRecord to NameServiceMartin Polden2017-12-044-22/+39
|/
* Move rotation to applicationMartin Polden2017-11-292-0/+3
|
* Add support for typeJon Marius Venstad2017-11-241-9/+27
|
* Merge branch 'master' into jvenstad/application-locking-revisedJon Marius Venstad2017-11-211-0/+1
|\
| * Reimplement /zone/v1Martin Polden2017-11-211-0/+1
| |
* | One author per lineJon Marius Venstad2017-11-211-1/+2
|/
* Resolved conflictJon Marius Venstad2017-11-172-0/+76
|\
| * Maintainer which asks for regular confirmation of ownershipJon Marius Venstad2017-11-162-0/+76
| |
* | Added TODO:Jon Marius Venstad2017-11-151-0/+1
|/
* Merge pull request #4006 from vespa-engine/mpolden/add-key-service-mockBjørn Christian Seime2017-11-031-0/+13
|\ | | | | Add key service mock