Add preflight OPTIONS handling and update CORS config #4086
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
|
We'll want to sequence this with #4154 if we decide to proceed with that one. |
- Implement early return with HTTP 204 (No Content) for OPTIONS requests in allowedHostsMiddleware to optimize preflight handling. - Extend CORS configuration to explicitly allow 'Authorization' headers and 'OPTIONS' method when OLLAMA_ORIGINS environment variable is set.
BruceMacD
force-pushed
the
brucemacd/auth-cors
branch
from
215b6ee
to
0e38ea4
Compare
This was referenced May 7, 2024
jmorganca
approved these changes
May 8, 2024
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.
Couple of tweaks to our CORS configuration and how we handle
OPTIONSrequests. This update is geared towards making our service more compatible with clients originally designed to work with OpenAI, where sending anAuthorizationheader is common.Details of Changes
Handling OPTIONS Requests: I added a quick return for
OPTIONSrequests in ourallowedHostsMiddleware. This means we're now ending these preflight requests with a 204 (No Content) status right off the bat.Updating CORS for Authorization Headers: Since some of the Ollama clients automatically send an
Authorizationheader (because they're set up for OpenAI), I've updated our CORS config to accept these headers. This is needed for making sure these clients can interact with our service without hitting CORS.Security
Since we're not currently using the
Authorizationheader for our own authentication, allowing this header doesn't open us up to new security risks as long as we don't have auth.Enabling the
OPTIONSmethod is mainly about letting browsers do their preflight check when they see thatAuthorizationheader. It's pretty standard and doesn't pose a direct risk by itself as far as I am aware.resolves #4001
resolves #3983
resolves ollama/ollama-js#80