sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/xapsd: rename supplemental patch so it is actually used

Browse source 
Rename and regenerate, so it is actually built with the patch.

Fixes:		fd3628b9b4
PR:		281607
Event:		EuroBSDcon 2024
This commit is contained in:
Henry 2024-09-20 12:29:14 +00:00 • committed by Robert Clausecker
parent d313252e4d
commit cc46cd04bf
2 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/xapsd/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= xapsd PORTNAME= xapsd
DISTVERSION= g20240326 DISTVERSION= g20240326
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= net CATEGORIES= net
MAINTAINER= PopularMoment@protonmail.com MAINTAINER= PopularMoment@protonmail.com

40
net/xapsd/files/0001-fix-apple-ignore-malformed-HTTP-headers.patch → net/xapsd/files/patch-pkg_apple__xserver__certs_http.go
View file

@ -1,20 +1,6 @@
From 1c52af3a7cc168cec089a810c32e861ab988840c Mon Sep 17 00:00:00 2001 --- pkg/apple_xserver_certs/http.go.orig 2024-03-26 13:15:17 UTC
From: Leon Klingele <git@leonklingele.de> +++ pkg/apple_xserver_certs/http.go
Date: Wed, 13 Mar 2024 22:12:25 +0100 @@ -1,11 +1,17 @@
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 package apple_xserver_certs
import ( import (
@ -26,12 +12,13 @@ index d39a6fc..939fcf0 100644
+ "io" + "io"
"io/ioutil" "io/ioutil"
"log" "log"
+ "math"
"net/http" "net/http"
+ "time" + "time"
) )
func NewCerts(username string, passwordhash string) *Certificates { func NewCerts(username string, passwordhash string) *Certificates {
@@ -50,7 +55,6 @@ func handleResponse(certs *Certificates, response []byte) *Certificates { @@ -50,7 +56,6 @@ func handleResponse(certs *Certificates, response []by
} }
func sendRequest(reqBody []byte, newCerts bool) (respBody []byte) { func sendRequest(reqBody []byte, newCerts bool) (respBody []byte) {
@ -39,7 +26,7 @@ index d39a6fc..939fcf0 100644
r := bytes.NewReader(reqBody) r := bytes.NewReader(reqBody)
url := "https://identity.apple.com/pushcert/caservice/renew" url := "https://identity.apple.com/pushcert/caservice/renew"
if newCerts { if newCerts {
@@ -67,12 +71,51 @@ func sendRequest(reqBody []byte, newCerts bool) (respBody []byte) { @@ -67,12 +72,51 @@ func sendRequest(reqBody []byte, newCerts bool) (respB
req.Header.Set("Accept", "*/*") req.Header.Set("Accept", "*/*")
req.Header.Set("Accept-Language", "en-us") req.Header.Set("Accept-Language", "en-us")
@ -57,16 +44,17 @@ index d39a6fc..939fcf0 100644
if err != nil { if err != nil {
- log.Fatalln(err) - log.Fatalln(err)
+ log.Fatalln(err) // TODO: Handle error properly + log.Fatalln(err) // TODO: Handle error properly
+ } }
+ defer func() { + defer func() {
+ _ = conn.Close() //nolint:errcheck,gosec // Ignored on purpose + _ = conn.Close() //nolint:errcheck,gosec // Ignored on purpose
+ }() + }()
+
- defer resp.Body.Close()
+ if err := req.Write(conn); err != nil { + if err := req.Write(conn); err != nil {
+ log.Fatalln(err) // TODO: Handle error properly + log.Fatalln(err) // TODO: Handle error properly
+ } + }
+ +
+ buf, err := io.ReadAll(io.LimitReader(conn, 1<<10)) + buf, err := io.ReadAll(io.LimitReader(conn, math.MaxInt64))
+ if err != nil { + if err != nil {
+ log.Fatalln(err) // TODO: Handle error properly + log.Fatalln(err) // TODO: Handle error properly
+ } + }
@ -85,15 +73,11 @@ index d39a6fc..939fcf0 100644
+ resp, err := http.ReadResponse(bufio.NewReader(bytes.NewReader(buf)), req) + resp, err := http.ReadResponse(bufio.NewReader(bytes.NewReader(buf)), req)
+ if err != nil { + if err != nil {
+ log.Fatalln(err) // TODO: Handle error properly + log.Fatalln(err) // TODO: Handle error properly
} + }
+ defer func() { + defer func() {
+ _ = resp.Body.Close() //nolint:errcheck,gosec // Ignored on purpose + _ = resp.Body.Close() //nolint:errcheck,gosec // Ignored on purpose
+ }() + }()
+
- defer resp.Body.Close()
respBody, err = ioutil.ReadAll(resp.Body) respBody, err = ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
--
2.34.1