Add support for Brave Services Key V2 (uplift to 1.62.x) #21688
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add support for Brave Services Key V2 And use for AI chat * Refactor * Move logic to brave_service_keys * Generalize logic such that callers can sign over multiple headers * Separate digest header generation * Rename AI_CHAT_SERVICE_KEY -> SERVICE_KEY_AI_CHAT * Separate SERVICE_KEY_AI_CHAT from signing logic * * Switch from base::span<> to const std::vector<>& * Move unused header to .cc file * Break apart functions and add more unit tests * Update GetAuthorizationHeaders * Pass the URL, HTTP method, full list of headers, and a list of headers to actually be signed to GetAuthorizationHeaders * Instead of using std::vector<std::pair<std::string, std::string>> for the list of headers, instead use base::flat_map<std::string, std::string> since that matches the headers passed to the APIRequestHelper * Enforce header ordering specified by headers_to_sign * Generate (request-target) header if supplied, and add test from spec * Pass url and method to CreateSignatureString This way, (request-target) can be generated inside there and thus be unit tested. Adjust unit tests. * Add VLOG(1) when header to sign does not exist Also DCHECK(false) for good measure. * Add SERVICE_KEY_AI_CHAT and KEY_ID to config.js This way they can be sourced from .env. * Update tests * Link to specific section test vectors are from * Remove the "(created)" header from headers_to_sign (it's not included in the test vector) * Use //crypto instad of //crypto:crypto in components/brave_service_keys/BUILD.gn * Use constexpr for http method constant * Don't use a reference to the digest header * Use NOTREACHED_NORETURN() instead of DCHECK and VLOG(1) * Use CHECK for url in GetAuthorizationHeader Brave Server URLs should always be defined * Uncomment base/flat_map.h include in unittest * Add comment explaining KEY_ID * Add comments explaining functions in service_key_utils * Add is_official_build check for service_key_ai_chat * Update header constants * Use existing constants for kDigest and kAuthorization * Change kRequestTarget to kRequestTargetHeader * Rename service_key_utils.* -> brave_service_key_utils.* * nit: use base::StrCat and .append() * Make headers a const& in CreateSignatureString * Rename KEY_ID -> BRAVE_SERVICES_KEY_ID * Fix formatting of string * Rename SERVICE_KEY_AI_CHAT-> SERVICE_KEY_AICHAT * Apply Jenkinsfile patch * Revert "Apply Jenkinsfile patch" This reverts commit 513bfda.
nvonpentz
changed the title
kjozwiak
approved these changes
Jan 23, 2024
There was a problem hiding this comment.
Uplift into 1.62.x approved 👍 QA has verified the PR on Nightly via 1.64.x as per #21542 (comment).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uplift of #21542
Resolves brave/brave-browser#35152
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_testswikinpm run lint,npm run presubmitwiki,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan: