Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CORS support #36

Merged
merged 2 commits into from
Nov 6, 2023
Merged

Add CORS support #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3a4cf6
Document docker cert.pem quirks
cben Nov 5, 2023
44c460b
Add CORS headers - allow for any domain
cben Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ Edit or change the db.env file to your liking. Then, run the following command:
```bash
docker-compose --env-file db.env up --build
```

Note this generates a self-signed cert & key during the build, separate from anything you might have in cert.pem file.
So once it built, you want to run this to get the same ./cert.pem:
```
docker run blood-donation-backend_blood-info /bin/cat cert.pem > cert.pem
```

### Stopping the containers
```bash
docker-compose --env-file db.env down --remove-orphans --volumes --rmi local
Expand Down
2 changes: 2 additions & 0 deletions cmd/server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ COPY --from=build /app/blood-info blood-info
COPY --from=build /app/tls-self-signed-cert tls-self-signed-cert

# FIXME: This is a hack to get the self-signed certificate to work. There must be a better way.
# FIXME: This makes the secret `key.pem` also part of the image; uploading the image anywhere would leak it!
# FIXME: any prior `cert.pem` & `key.pem` you had in current dir are *also* leaked in the COPY layer.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #37 to track this

RUN ./tls-self-signed-cert

RUN addgroup -S gouser && adduser -S gouser -G gouser
Expand Down
9 changes: 8 additions & 1 deletion cmd/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/il-blood-donation-info/blood-donation-backend/pkg/api"
"github.com/il-blood-donation-info/blood-donation-backend/server"
middleware "github.com/oapi-codegen/nethttp-middleware"
"github.com/rs/cors"
"gorm.io/driver/postgres"
"gorm.io/gorm"
"log"
Expand Down Expand Up @@ -51,9 +52,15 @@ func main() {
swagger.Servers = nil

strictBloodInfoServer := server.NewStrictBloodInfoServer(db)
strictHandler := api.NewStrictHandler(strictBloodInfoServer, nil)

// We can add 2 kinds of middlewares:
// - "strict" middlewares here deal in per-request generated `api` types.
// - r.Use() chi middlewares below deal in de-facto standard `http.Handler`.
strictMiddlewares := []api.StrictMiddlewareFunc{}
strictHandler := api.NewStrictHandler(strictBloodInfoServer, strictMiddlewares)

r := chi.NewRouter()
r.Use(cors.Default().Handler) // Tell browsers cross-origin requests OK from any domain.
r.Use(middleware.OapiRequestValidator(swagger))
api.HandlerFromMux(strictHandler, r)
s := &http.Server{
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/go-chi/chi/v5 v5.0.10
github.com/oapi-codegen/nethttp-middleware v1.0.1
github.com/oapi-codegen/runtime v1.0.0
github.com/rs/cors v1.10.1
gorm.io/driver/postgres v1.5.3
gorm.io/gorm v1.25.5
)
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
Expand Down