-
Notifications
You must be signed in to change notification settings - Fork 25
Add automatic TLS certificate support via Let's Encrypt #3
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.
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1cb0564
Add automatic TLS certificate support via Let's Encrypt
hrntknr 7ded489
Add TLS_ACCEPT_TOS configuration option
hrntknr e3b61ef
Improve TLS server lifecycle management with graceful shutdown
hrntknr d81723f
Improve error handling for server shutdown
hrntknr 4ad21a0
Improve concurrent server error handling
hrntknr b38d4b8
Fix server shutdown race condition and improve error handling
hrntknr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| "mcpServers": { | ||
| "test": { | ||
| "type": "http", | ||
| "url": "http://localhost:8081/mcp" | ||
| "url": "http://localhost/mcp" | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,11 +1,15 @@ | ||||||||||||
| package mcpproxy | ||||||||||||
|
|
||||||||||||
| import ( | ||||||||||||
| "context" | ||||||||||||
| "crypto/sha256" | ||||||||||||
| "errors" | ||||||||||||
| "fmt" | ||||||||||||
| "net/http" | ||||||||||||
| "net/url" | ||||||||||||
| "os" | ||||||||||||
| "path" | ||||||||||||
| "sync" | ||||||||||||
| "time" | ||||||||||||
|
|
||||||||||||
| "github.com/blendle/zapdriver" | ||||||||||||
|
|
@@ -19,11 +23,17 @@ import ( | |||||||||||
| "github.com/sigbit/mcp-auth-proxy/pkg/repository" | ||||||||||||
| "github.com/sigbit/mcp-auth-proxy/pkg/utils" | ||||||||||||
| "go.uber.org/zap" | ||||||||||||
| "golang.org/x/crypto/acme" | ||||||||||||
| "golang.org/x/crypto/acme/autocert" | ||||||||||||
| "golang.org/x/crypto/bcrypt" | ||||||||||||
| ) | ||||||||||||
|
|
||||||||||||
| func Run( | ||||||||||||
| listen string, | ||||||||||||
| listenTLS string, | ||||||||||||
| tlsHost string, | ||||||||||||
| tlsDirectoryURL string, | ||||||||||||
| tlsAcceptTOS bool, | ||||||||||||
| dataPath string, | ||||||||||||
| externalURL string, | ||||||||||||
| proxyURL string, | ||||||||||||
|
|
@@ -131,6 +141,77 @@ func Run( | |||||||||||
| idpRouter.SetupRoutes(router) | ||||||||||||
| proxyRouter.SetupRoutes(router) | ||||||||||||
|
|
||||||||||||
| logger.Info("Starting server", zap.String("listen", listen)) | ||||||||||||
| return router.Run(listen) | ||||||||||||
| if tlsHost != "" { | ||||||||||||
| m := autocert.Manager{ | ||||||||||||
| Prompt: func(tosURL string) bool { | ||||||||||||
| return tlsAcceptTOS | ||||||||||||
| }, | ||||||||||||
| HostPolicy: autocert.HostWhitelist(tlsHost), | ||||||||||||
| Cache: autocert.DirCache(path.Join(dataPath, "certs")), | ||||||||||||
| Client: &acme.Client{ | ||||||||||||
| DirectoryURL: tlsDirectoryURL, | ||||||||||||
| }, | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| exit := make(chan struct{}, 2) | ||||||||||||
| var wg sync.WaitGroup | ||||||||||||
|
|
||||||||||||
| httpServer := &http.Server{ | ||||||||||||
| Addr: listen, | ||||||||||||
| Handler: m.HTTPHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||||||||||||
| host := r.Host | ||||||||||||
| if host == "" { | ||||||||||||
| host = r.URL.Host | ||||||||||||
| } | ||||||||||||
| target := "https://" + host + r.RequestURI | ||||||||||||
| http.Redirect(w, r, target, http.StatusMovedPermanently) | ||||||||||||
| })), | ||||||||||||
| } | ||||||||||||
| httpsServer := &http.Server{ | ||||||||||||
| Addr: listenTLS, | ||||||||||||
| Handler: router, | ||||||||||||
| TLSConfig: m.TLSConfig(), | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| wg.Add(2) | ||||||||||||
| errs := []error{} | ||||||||||||
| lock := sync.Mutex{} | ||||||||||||
| go func() { | ||||||||||||
| defer wg.Done() | ||||||||||||
| err := httpServer.ListenAndServe() | ||||||||||||
| if err != nil && !errors.Is(err, http.ErrServerClosed) { | ||||||||||||
| lock.Lock() | ||||||||||||
| errs = append(errs, err) | ||||||||||||
| lock.Unlock() | ||||||||||||
| } | ||||||||||||
| exit <- struct{}{} | ||||||||||||
| }() | ||||||||||||
|
|
||||||||||||
| go func() { | ||||||||||||
| defer wg.Done() | ||||||||||||
| err := httpsServer.ListenAndServeTLS("", "") | ||||||||||||
| if err != nil && !errors.Is(err, http.ErrServerClosed) { | ||||||||||||
| lock.Lock() | ||||||||||||
| errs = append(errs, err) | ||||||||||||
| lock.Unlock() | ||||||||||||
| } | ||||||||||||
| exit <- struct{}{} | ||||||||||||
| }() | ||||||||||||
|
|
||||||||||||
| logger.Info("Starting server", zap.Strings("listen", []string{listen, listenTLS})) | ||||||||||||
| <-exit | ||||||||||||
|
||||||||||||
| <-exit | |
| }() | |
| logger.Info("Starting server", zap.Strings("listen", []string{listen, listenTLS})) | |
| wg.Wait() |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The acme.Client configuration is incomplete. The Client field should not be set manually when using autocert.Manager, as the manager handles ACME client configuration internally. Remove the Client field assignment.