-
Notifications
You must be signed in to change notification settings - Fork 753
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ChangeLog: https://github.com/freswa/dovecot-xaps-daemon/compare/836a75b..1e589be PR: 278199 Reported by: PopularMoment@protonmail.com (maintainer)
- Loading branch information
Showing
3 changed files
with
107 additions
and
11 deletions.
There are no files selected for viewing
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
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
99 changes: 99 additions & 0 deletions
99
net/xapsd/files/0001-fix-apple-ignore-malformed-HTTP-headers.patch
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| From 1c52af3a7cc168cec089a810c32e861ab988840c Mon Sep 17 00:00:00 2001 | ||
| From: Leon Klingele <git@leonklingele.de> | ||
| Date: Wed, 13 Mar 2024 22:12:25 +0100 | ||
| Subject: [PATCH] fix(apple): ignore malformed HTTP headers | ||
|
|
||
| See also https://github.com/golang/go/issues/21290. | ||
|
|
||
| Fixes https://github.com/freswa/dovecot-xaps-daemon/issues/24. | ||
| --- | ||
| pkg/apple_xserver_certs/http.go | 51 ++++++++++++++++++++++++++++++--- | ||
| 1 file changed, 47 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/pkg/apple_xserver_certs/http.go b/pkg/apple_xserver_certs/http.go | ||
| index d39a6fc..939fcf0 100644 | ||
| --- a/pkg/apple_xserver_certs/http.go | ||
| +++ b/pkg/apple_xserver_certs/http.go | ||
| @@ -1,11 +1,16 @@ | ||
| package apple_xserver_certs | ||
|
|
||
| import ( | ||
| + "bufio" | ||
| "bytes" | ||
| + "context" | ||
| + "crypto/tls" | ||
| "encoding/pem" | ||
| + "io" | ||
| "io/ioutil" | ||
| "log" | ||
| "net/http" | ||
| + "time" | ||
| ) | ||
|
|
||
| func NewCerts(username string, passwordhash string) *Certificates { | ||
| @@ -50,7 +55,6 @@ func handleResponse(certs *Certificates, response []byte) *Certificates { | ||
| } | ||
|
|
||
| func sendRequest(reqBody []byte, newCerts bool) (respBody []byte) { | ||
| - client := &http.Client{} | ||
| r := bytes.NewReader(reqBody) | ||
| url := "https://identity.apple.com/pushcert/caservice/renew" | ||
| if newCerts { | ||
| @@ -67,12 +71,51 @@ func sendRequest(reqBody []byte, newCerts bool) (respBody []byte) { | ||
| req.Header.Set("Accept", "*/*") | ||
| req.Header.Set("Accept-Language", "en-us") | ||
|
|
||
| - resp, err := client.Do(req) | ||
| + req.Close = true | ||
| + | ||
| + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) | ||
| + defer cancel() | ||
| + | ||
| + conn, err := new(tls.Dialer).DialContext( | ||
| + ctx, | ||
| + "tcp", | ||
| + req.URL.Host+":443", | ||
| + ) | ||
| if err != nil { | ||
| - log.Fatalln(err) | ||
| + log.Fatalln(err) // TODO: Handle error properly | ||
| + } | ||
| + defer func() { | ||
| + _ = conn.Close() //nolint:errcheck,gosec // Ignored on purpose | ||
| + }() | ||
| + | ||
| + if err := req.Write(conn); err != nil { | ||
| + log.Fatalln(err) // TODO: Handle error properly | ||
| + } | ||
| + | ||
| + buf, err := io.ReadAll(io.LimitReader(conn, 1<<10)) | ||
| + if err != nil { | ||
| + log.Fatalln(err) // TODO: Handle error properly | ||
| + } | ||
| + | ||
| + const ( | ||
| + cr = "\r" | ||
| + nl = "\n" | ||
| + ) | ||
| + for _, ign := range []string{ | ||
| + "1;: mode=block", | ||
| + "max-age=31536000;: includeSubdomains", | ||
| + } { | ||
| + buf = bytes.Replace(buf, []byte(nl+ign+cr+nl), []byte(nl), 1) | ||
| + } | ||
| + | ||
| + resp, err := http.ReadResponse(bufio.NewReader(bytes.NewReader(buf)), req) | ||
| + if err != nil { | ||
| + log.Fatalln(err) // TODO: Handle error properly | ||
| } | ||
| + defer func() { | ||
| + _ = resp.Body.Close() //nolint:errcheck,gosec // Ignored on purpose | ||
| + }() | ||
|
|
||
| - defer resp.Body.Close() | ||
| respBody, err = ioutil.ReadAll(resp.Body) | ||
| if err != nil { | ||
| log.Fatalln(err) | ||
| -- | ||
| 2.34.1 | ||
|
|