mirror of
https://git.freebsd.org/ports.git
synced 2025-05-20 11:03:09 -04:00
cc46cd04bf
Rename and regenerate, so it is actually built with the patch.
Fixes: fd3628b9b4
PR: 281607
Event: EuroBSDcon 2024
83 lines
2 KiB
Go
83 lines
2 KiB
Go
--- pkg/apple_xserver_certs/http.go.orig 2024-03-26 13:15:17 UTC
|
|
+++ pkg/apple_xserver_certs/http.go
|
|
@@ -1,11 +1,17 @@
|
|
package apple_xserver_certs
|
|
|
|
import (
|
|
+ "bufio"
|
|
"bytes"
|
|
+ "context"
|
|
+ "crypto/tls"
|
|
"encoding/pem"
|
|
+ "io"
|
|
"io/ioutil"
|
|
"log"
|
|
+ "math"
|
|
"net/http"
|
|
+ "time"
|
|
)
|
|
|
|
func NewCerts(username string, passwordhash string) *Certificates {
|
|
@@ -50,7 +56,6 @@ func handleResponse(certs *Certificates, response []by
|
|
}
|
|
|
|
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 +72,51 @@ func sendRequest(reqBody []byte, newCerts bool) (respB
|
|
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
|
|
+ }()
|
|
|
|
- defer resp.Body.Close()
|
|
+ if err := req.Write(conn); err != nil {
|
|
+ log.Fatalln(err) // TODO: Handle error properly
|
|
+ }
|
|
+
|
|
+ buf, err := io.ReadAll(io.LimitReader(conn, math.MaxInt64))
|
|
+ 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
|
|
+ }()
|
|
+
|
|
respBody, err = ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
log.Fatalln(err)
|