Commit Graph
236 Commits
Author SHA1 Message Date
Tim Bruijnzeels 055b817881 Cargo clippy - rust 1.54 2021-08-30 13:13:20 +02:00
Tim Bruijnzeels 8bbd5c2e78 Remove calls to refresh_all in test
This is done in the expectation check now.
2021-08-30 10:47:28 +02:00
Tim Bruijnzeels 48c6557bd3 Unsuspend child CA when it sends a valid RFC 6492 request. (#623)
(also make tests more deterministic wrt ca refresh)
2021-08-30 10:47:28 +02:00
Tim Bruijnzeels 319f00081a Add support (and API) for suspending/unsuspending child CAs. (#623) 2021-08-30 10:47:28 +02:00
Ximon Eighteen 55a944e255 Temporarily disable the RIPE NCC Validator 3 test until I can work out why it is trying to rsync from an HTTP URI... 2021-08-17 14:52:23 +02:00
Ximon Eighteen 62cadf8e8a E2E test minor logging improvements: Fix an empty "->" log line in the E2E test and add the API call being made to each of the messages logged during initial Krill setup. 2021-08-17 12:32:49 +02:00
Tim BruijnzeelsandGitHub 765b131184 Create ROAs if needed, when keys are activated (#601) 2021-08-04 12:06:47 +02:00
Ximon Eighteen 45977aa136 Remove more intercepts and waits that might be blocking the test from progressing. 2021-08-03 10:00:19 +02:00
Ximon Eighteen fa95116bc5 Comment out problematic waiting for now... 2021-08-03 10:00:16 +02:00
Ximon Eighteen a2667c2db3 Ignore all unhandled promise rejections
Newer Cypress fails tests in more situations than Cypress 6.8.0, but we’re not ready to investigate the root cause yet so just retain the previous behaviour for now.
2021-08-03 09:57:47 +02:00
Ximon Eighteen 8a708c9c72 FIX: Test Rust function name should match the JS test being executed. 2021-08-01 21:48:24 +02:00
Ximon Eighteen fc5683cefa FIX: Logout intercept should be POST not GET. 2021-08-01 21:48:18 +02:00
Ximon Eighteen ffd6c09460 FIX: syntax error in Cypress intercept() call. 2021-08-01 20:33:16 +02:00
Ximon Eighteen 5c3a463e1b Update intercept calls per Cypress 7 migration guide. 2021-08-01 20:14:45 +02:00
Ximon Eighteen ba0bb12cc7 Upgrade Cypress from 8.0.0 to 8.1.0.
See if any of the fixes help with the hanging UI tests.
2021-08-01 20:14:36 +02:00
Ximon Eighteen ad70e0e05a Attempt to work around the ESOCKETTIMEDOUT test failure in GH Actions. This change solves the issue in an AWS t2.small VM. 2021-07-30 00:38:39 +02:00
Ximon Eighteen cc3419074b FIX: Upgraded Cypress uses an err.message field, not an err.description field. Check the right field to catch the uncaught exception 'Redirected when going from "/onboarding" to "/interstitial" via a navigation guard' caused during the 'can logout' test in the multi_user_config_file test. 2021-07-29 20:43:55 +02:00
Ximon Eighteen fb33669664 Prevent Cypress failing the can logout test due to an uncaught "Redirected when going from "/onboarding" to "/interstitial" via a navigation guard." exception in Lagosta. 2021-07-29 17:20:30 +02:00
Ximon EighteenandGitHub f504d00a84 FIX: Don't assume err.description is non-null as since the ugprade from Cypress 6.8.0 to 8.0.0 sometimes it isn't. 2021-07-29 17:01:51 +02:00
Ximon EighteenandGitHub 4d5c6c5147 Bump Cypress to latest (6,8.0 -> 8.0.0) as advised in https://github.com/cypress-io/cypress/issues/7062 "cy.visit() failed trying to load ESOCKETTIMEDOUT". 2021-07-29 16:21:23 +02:00
Ximon EighteenandGitHub 5f913be94a Fix incorrect conditional Cypress test logic. 2021-07-29 15:02:49 +02:00
Ximon Eighteen cc94c6a658 Silence spurious unused code warnings concerning the OpenID Connect mock. 2021-07-29 11:40:11 +02:00
3ee53f0059 Migrate CA repository using key rollover (#480)
As it turns out - this was broken earlier becuase of a failure to republish
objects during a key roll during 0.9.0 development - fixed in issue #509
prior to the 0.9.0 release.

Co-authored-by: Ximon Eighteen <3304436+ximon18@users.noreply.github.com>
2021-07-13 15:51:07 +02:00
Ximon Eighteen 842264141f Merge branch 'dev' of github.com:NLnetLabs/krill into dev 2021-07-12 17:03:55 +02:00
Ximon Eighteen e024457a50 Experiment with trying not to wait for a request to the server that will never happen (partial attempt at fixing #603). 2021-07-12 17:03:47 +02:00
Tim BruijnzeelsandGitHub 8be620b606 Update dependencies: rpki-rs, bytes, tokio, hyper, reqwest (#584)
* Update dependencies: rpki-rs, and therefore bytes, tokio, hyper, reqwest
* Rust 1.51 clippy
* Update minimal rust version to 1.47
    socket2 requires improved const fn support.
    exponential compile-time and type_length_limit and async in 1.46.

See PR #586
2021-07-02 10:20:24 +02:00
Tim Bruijnzeels 9458adc821 Cargo fmt before release 0.9.0-rc3 (#528) 2021-05-20 15:56:27 +02:00
Tim Bruijnzeels ff1c7f74f6 Remove krillpubc - use 'pubserver' subcommand in krillc instead. (#527) 2021-05-20 12:51:52 +02:00
Tim Bruijnzeels e7cadc6ea2 Use a little more patience when testing (think GH CI hardware) 2021-05-11 16:22:18 +02:00
Tim BruijnzeelsandGitHub 5a29ffaa88 Re-issue ROAs and CA certificates on key activation. (#509) 2021-05-06 09:49:03 +02:00
Tim BruijnzeelsandGitHub 8ae546039a Remove resource classes (and withdraw objects) when a parent is removed (#508) 2021-05-04 14:58:28 +02:00
Tim BruijnzeelsandGitHub 17b928b7cc Use more descriptive KrillIoError where feasible (#495) 2021-05-04 13:53:03 +02:00
Ximon EighteenandGitHub 13b6f7d1f3 Security tweaks (#382) (#484)
* Encrypt session state using ChaCha20-Poly1305 instead of AES-GCM.
* Replace config file users login use of insecure unsalted SHA2 password hashing with secure scrypt salted password hashing.
* Log the start of the request before determining the actor.
* Allow sufficient time for password hashing delays during login with config file user based tests..
* Synced with Lagosta commit b49f23de.
2021-04-20 00:47:22 +02:00
Tim BruijnzeelsandGitHub b43a6815cf Inconsistent and unacceptable token references (#433) (#483) 2021-04-19 22:23:02 +02:00
Ximon EighteenandGitHub 675d902ec0 Typo correction in e2e test comment: dependendencies -> dependencies 2021-04-19 10:39:57 +02:00
Tim Bruijnzeels 38167616c7 Ignore failing migration test, see issues #480 and #481. Closes #445. 2021-04-15 10:43:13 +02:00
Tim Bruijnzeels 6e55e025ad Separate migrate repository test. 2021-04-14 16:24:35 +02:00
Tim Bruijnzeels 0642a2448c Increase delay for resync after key activation in functional test. 2021-04-14 10:15:16 +02:00
Tim Bruijnzeels b37b841e3a Add a small delay before resyncing after key activation. 2021-04-13 22:09:03 +02:00
8a36517126 Error handling fixes and improvements (#464)
Fixes:
* Just use the token we have if we would ideally refresh before expiration but don't have a refresh token.
* Don't hide useful OpenID Connect error details (such as self-signed cert rejected instead of just request failed). (fixes #427)
* Lagosta fixes from branch issue-379-handle-connection-issues commit 58f5ccc7 (relates to #442).

Functional improvements:
* Return or log less in some error scenarios (#419).
* Upgrade to Oso 0.11.2 to get a MUCH better error report when a ?= query in a .polar file fails, plus the Mutex around Oso is no longer needed.
* Log when OIDC discovery completes successfully.
* Be cautious, just log connection issues to the OpenID Connect provider for now, don't retry discovery.
* Use a lower timeout for the OpenID Connect HTTP client than the normal Krill HTTP client.
* Log more cause chains where available.

Code quality improvements:
* Apply review feddback: unwrap locks and crash out via panic to be consistent with the rest of Krill.
* Factor out the repeated RAII guard handling.
* Split login() out into helper methods.
* Removed TODO comment.

Testing improvements:
* Removed left-behind debug screenshot.
* Add a test to show a bug whereby access is wrongly denied if a token is pending expiration and has no refresh token. 
* Add a test to make sure Krill handles timeout of requests to the OIDC provider correctly. Also adds support for a lower timeout in test mode ala how it's done elsewhere in Krill, and more faithfully replicates the normal Krill HTTP client configuration when configuring the OIDC HTTP client. Also factored the OIDC HTTP client code out as it is getting too large to live in provider.rs.
* Extend the OpenID Connect provider not available test to show that Krill copes with the provider being unavailable and coming back to life again.
* Re-worked the test/mock relationship so that the mock no longer has hard-coded users and username based behaviour activation but rather now the test sets the desired behaviour and is thus easier to understand and more flexible.
* Extended the OpenID Connect mock so that its endpoints can be disabled and enabled during tests, and be disabled before Krill even does initial discovery.
* Use example.com based bad ACR ID token.
* Remove support for the NoResponse mock failure mode as it blocks the tiny http server thread indefinitely also preventing a test using it from exiting, and adds little no perceived benefit over the SlowResponse failure mode (which does at least stop blocking within the expected test run time).
* The mock OpenID Connect provider must be shutdown before the UI test result is asserted, otherwise the test process never terminates.
* Use the expected OpenID Connect provider timeout when in test mode.
* Extend the openid connect test to test the 'hybrid' user attributes case.
* Give the login more time to complete before expiring the access token. (#466).
* Wait for the right backend status BEFORE clicking the ROAs tab. (#465)

Other:
* OpenID Connect log message consistency tweaks.
* Sync with updated correspoinding Lagosta branch commit d2a92fe1 with latest Lagosta master merged in and a yarn build empty catch block fix.
* Sync with commit b9a2f5b3 in the corresponding PR branch in Lagosta to get a testbed REST API client fix.

Co-authored-by: Tim Bruijnzeels <tim@nlnetlabs.nl>
2021-04-13 12:13:18 +02:00
7cb5674033 Stabilize API and CLI (#330 and #360)
* Move child_request API endpoint for conststency. (#330)
* Move get RFC 8183 Publisher Request API endpoints (#330)
* Accept XML and json to add/update parent on same endpoints (#330)
* Simplify the JSON to add a child and remove unused fields. (#330)
* Update path to child_request in openapi spec.
* Update path to publisher request.
* Update api spec and documentation.
* Fix update parent API documentation and call by CLI.
* CLI stability
* Update pubd OpenAPI spec t o match changes made to the Krill API.
* Update the e2e test client code to submit only the id_cert and not the whole RFC8183 request, as required by changes made to the Krill API.

Co-authored-by: Ximon Eighteen <3304436+ximon18@users.noreply.github.com>
2021-04-12 17:24:41 +02:00
Tim Bruijnzeels 9c522ef36c Wait a bit before adding the repository to the CA (#445) 2021-04-06 10:46:38 +02:00
a715c82f7f Remove embedded repo/ca choices (#461)
* Remove embedded repository contact option, migrate commands and events.
* Migrate old CA init events. Test upgrade from 0.6.0.
* Migrate embedded in CA history.

Co-authored-by: Ximon Eighteen <3304436+ximon18@users.noreply.github.com>
2021-04-01 17:18:28 +02:00
Ximon EighteenandGitHub f3e8023be5 Support fine grained access per CA (resolves #437) (#443)
- Various changes to support a grey policy in between black and white approach of permitting or denying access to CAs entirely, whereby a user can have a different role in one CA than in another.
- Introduces the NoResourceType for requests not relating to a specific "resource", e.g. CA, such as LOGIN. NoResourceType maps to `nil` in Oso policy language.
- Add support for Permission constants in Polar files. Build the Permission enum using a macro.
- Added CA_ADMIN (for bulk operations) and CA_DELETE permissions.
- Support loading more than one custom auth policy file.
- Checks were missing on some API calls if the user had the necessary permission *on the relevant resources*.
- Rename the team policy as a demo to indicate that it is educational only.
- Split a role-per-ca demo out of the team policy demo.
- Extend the with_ta Cypress test to cover the role-per-ca ca demo policy (as it creates the needed data).
- Don't misrepresent an external policy file in log statements as being internal.
- Better comments describing what the tests are doing.
- Remove unused role parameter in team access demo policy.
- Add disallow() in Oso policies as a way to define deny rules.
2021-03-25 21:35:38 +01:00
23be0b5ef7 Make testbed fully configurable through config section
* Let users configure the AIA to use with TA certificates. Set 'ta_aia' in the config file. (#409)
* Use explicit configuration section for testbed, no longer rely on magic env variables.

Note: this will all be revised again if/when the Publication server and TA vs CA code is fully separated in future.

Co-authored-by: Ximon Eighteen <3304436+ximon18@users.noreply.github.com>
2021-03-22 16:53:41 +01:00
e662c1553b Change to a hybrid event sourcing model for CAs and Repository. (#426)
This allows us to keep the full history of semantically important events, while not spamming the history and avoiding excessive use of disk space. See issues #370 and #423.

This is a substantial change. Highlights follow:
* Added a developer documentation section
* No longer using events for manifest/crl generation (#370)
* No longer using events for publication deltas (#423)
* Removed pre 0.6.0 migration code - people will have to upgrade to at least 0.6.0 first
* Added migration code for 0.6.0-0.8.1 to this
* Migrate repository by doing a keyroll. (#370)
* Remove archiving code for commands (no longer applicable)

Minor other fixes:
* Use a swap file when writing (avoid corrupt json if disk is full) (#370)
* Make removing publisher content idempotent for publishers already removed.

Co-authored-by: Ximon Eighteen <3304436+ximon18@users.noreply.github.com>
Co-authored-by: Jasper den Hertog <jasper@plainspace.com>
2021-03-17 12:08:36 +01:00
Ximon EighteenandGitHub cf1f8a9c16 Improvements and fixes for e2e testing on the Krill dev branch (#439)
Note: Until merged to master this branch requires that a branch by the same name exists in the rpki-deploy repo with the corresponding changes to support these changes, which include:

- OpenAPI YML corrections.
- Support the new way to activate the TA.
- FIX: Include the correct ta.cer URI in the TAL.
- Use two seprarate Python libraries for Krill: one for CA REST SAPIs and one for PUB REST APIs.
- FIX: Test for the actual CAs and resources to create, as the presence of the testbed CA violates the previous check assumptions.
- FIX: Resource ASN, v4 and v6 values can no longer be assumed to have the same sort order as when given to Krill.
- Factor out test suite code into helper functions for better readability and maintainability.
- Retry RTR fetching (needed for ROAs obtained from Rcynic Lihttpd server served JSON as otherwise connecting too early results in SyncTimeout).

Known issues: on failure all RP tests will retry 3 times while actually only the Rcynic test should retry.
2021-03-15 12:10:08 +01:00
Ximon EighteenandGitHub 0f930f37ef Logout enhancements (closes #385, closes #397, fixes #408, closes #425) (#436)
- Formalize support for different logout strategies and add the fallback strategy.
- Generate the logout URL at logout time in preparation for supporting dynamic logout requests (as needed by token revocation).
- Secure the connection to the mock OpenID Connect provider with a self-signed TLS certificate.
- Allow self-signed certificates for HTTPS connections to localhost (same policy as elsewhere in Krill).
- Upgrade openidconnect-rs to latest v2.0.0 alpha to gain contributed support for OAuth 2.0 Token Revocation. (#385 and #397)
- Use reqwest 0.9.x directly instead of via the openidconnect-rs crate (we cannot use the v0.11.x reqwest that comes with the crate as (a) it doesn't permit self-signed certificates, (b) the blocking implementation was changed to be async which causes problems when inside an existing async runtime, and (c) switching the OpenID Connect client code over to be async is non-trivial - see #428).
- Pass the ID token as `id_token_hint` to the OpenID Connect RP-Initiated Logout 1.0 endpoint. (#408)
- Refined logic for the various logout mechanism permutations. (#425).
- Require OpenID Connection RP-Initiated Logout 1.0 and OAuth 2.0 Token Revocation endpoints to be HTTPS per the specs.
- Passes manual testing with Microsoft Azure Active Directory RP-Initiated Logout support and Google Compute Cloud OAuth 2.0 Token Revocation support.
- Added a Google Cloud Platform example to the comments in the default config file.
- Updated and added tests.
- Fixed logout and token revocation in the mock OpenID Connect provider to actually terminate login sessions.
- Handle a race condition in Lagosta where null user data was accessed that was just deleted due to logout.
- Handle errors from the Krill logout endpoint in Lagosta.
2021-03-08 23:39:45 +01:00
Ximon EighteenandGitHub 47830dbf37 Check the OpenID Connect CSRF token (resolves #383). (#424)
Use a user agent cookie with strict security settings to verify the CSRF token. Adds a test to verify that passing the wrong CSRF state value to Krill correctly results in an error.
2021-03-08 12:09:13 +01:00
Ximon EighteenandGitHub e3eb5e6752 Add a CTRL-C handler to Cypress UI tests to prevent the Cypress Docker container being left running if the test is aborted while running. (#431) 2021-03-08 11:27:23 +01:00