aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Move all Athenz API classes to controller-apiBjørn Christian Seime2017-12-0639-550/+98
* Add NToken to AthenzPrincipalBjørn Christian Seime2017-12-065-6/+20
* remove reference ZMSClientException/ZTSClientExceptionBjørn Christian Seime2017-12-065-16/+14
* Remove reference to PrincipalToken from NTokenBjørn Christian Seime2017-12-067-156/+51
* Merge pull request #4360 from vespa-engine/mpolden/curator-lock-for-rotation-...Jon Bratseth2017-12-0510-66/+108
|\
| * Use curator lock when assigning rotationMartin Polden2017-12-055-35/+75
| * Clean up test codeMartin Polden2017-12-055-31/+33
* | Revert "Replace usage of KeyService with SecretStore"Arnstein Ressem2017-12-053-16/+16
|/
* Merge pull request #4356 from vespa-engine/mpolden/remove-rotations-migrationMorten Tokle2017-12-0516-129/+43
|\
| * Remove unused methodMartin Polden2017-12-051-4/+0
| * Remove rotations from ControllerDbMartin Polden2017-12-053-66/+4
| * Fix a few TODOsMartin Polden2017-12-053-20/+10
| * Shorten method namesMartin Polden2017-12-0513-40/+30
* | Merge pull request #4358 from vespa-engine/bjorncs/fixMorten Tokle2017-12-051-2/+2
|\ \ | |/ |/|
| * Fix invalid id bug introduced after recent refactoringBjørn Christian Seime2017-12-051-2/+2
* | Merge pull request #4349 from vespa-engine/mortent/remove-keyserviceMorten Tokle2017-12-053-16/+16
|\ \ | |/ |/|
| * Replace usage of KeyService with SecretStoreMorten Tokle2017-11-303-16/+16
* | Merge pull request #4342 from vespa-engine/bjorncs/enforce-athenz-principalMorten Tokle2017-12-0525-279/+398
|\ \
| * | Remove token signature from NToken.toString()Bjørn Christian Seime2017-12-041-1/+1
| * | Cleanup authorization testing in ApplicationApiTestBjørn Christian Seime2017-12-043-109/+143
| * | Introduce AthenzIdentity and AthenzUserBjørn Christian Seime2017-12-0422-165/+248
| * | The principal is always an AthenzPrincipalBjørn Christian Seime2017-12-041-4/+6
* | | Shorten log messageMartin Polden2017-12-041-1/+3
* | | Add removeRecord to NameServiceMartin Polden2017-12-041-1/+1
|/ /
* | Merge pull request #4335 from vespa-engine/mpolden/revert-log-level-changeMorten Tokle2017-12-041-1/+1
|\ \
| * | Revert "Reduce to FINER"Martin Polden2017-12-041-1/+1
* | | Split parent + container-dependency-versions from root pom.gjoranv2017-12-011-0/+1
|/ /
* | Revert "Gjoranv/split parent2"gjoranv2017-11-301-1/+0
* | Merge pull request #4318 from vespa-engine/gjoranv/split-parent2gjoranv2017-11-301-0/+1
|\ \ | |/ |/|
| * Split parent + container-dependency-versions from root pom.gjoranv2017-11-301-0/+1
* | Merge pull request #4309 from vespa-engine/mpolden/move-rotation-to-applicationMartin Polden2017-11-3029-708/+744
|\ \ | |/ |/|
| * Move rotation to applicationMartin Polden2017-11-2928-691/+725
| * Make ControllerDb an interfaceMartin Polden2017-11-282-19/+19
* | Revert "Gjoranv/split parent"gjoranv2017-11-291-1/+0
* | Split parent + container-dependency-versions from root pom.gjoranv2017-11-291-0/+1
* | Merge pull request #4267 from vespa-engine/mortent/validate-identityBjørn Christian Seime2017-11-275-8/+101
|\ \ | |/ |/|
| * Validate athenz-domain in deployment.xml equal to tenant domainMorten Tokle2017-11-245-8/+101
* | Fix rotations metricMartin Polden2017-11-242-18/+23
|/
* Merge pull request #4247 from vespa-engine/mpolden/import-zone-api-v2Jon Bratseth2017-11-2321-10/+1028
|\
| * Reimplement /zone/v2Martin Polden2017-11-229-2/+325
| * Import proxy packageMartin Polden2017-11-229-0/+675
| * Set correct URL in defaultRegionMartin Polden2017-11-224-8/+28
* | Reduce log noise: No need to log stack traceHarald Musum2017-11-231-1/+2
* | Exclude all Jackson deps from athenz zms/zts java clientBjørn Christian Seime2017-11-221-0/+26
* | Match Before annotation is the internal user auth filterBjørn Christian Seime2017-11-221-2/+0
* | Improve error message when user authentication failsBjørn Christian Seime2017-11-223-17/+26
* | Merge pull request #4240 from vespa-engine/bjorncs/rewrite-user-principal-to-...Bjørn Christian Seime2017-11-221-3/+27
|\ \
| * | Improve error messageBjørn Christian Seime2017-11-221-1/+1
| * | Rename method to better indicate its functionBjørn Christian Seime2017-11-221-2/+2
| * | Rewrite user principal as Athenz principalBjørn Christian Seime2017-11-221-0/+24
| |/