Skip to content

Commit 5b83822

Browse files
viceice-botGusted
viceice-bot
authored and
Gusted
committed
Update module github.com/go-ldap/ldap/v3 to v3.4.14 (forgejo) (#13486)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/13486 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org>
1 parent 8577cca commit 5b83822

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
connectrpc.com/connect v1.20.0
2323
github.com/42wim/httpsig v1.2.3
2424
github.com/42wim/sshsig v0.0.0-20250502153856-5100632e8920
25-
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
25+
github.com/Azure/go-ntlmssp v0.1.1
2626
github.com/ProtonMail/go-crypto v1.4.1
2727
github.com/PuerkitoBio/goquery v1.12.0
2828
github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.9.0
@@ -48,7 +48,7 @@ require (
4848
github.com/go-chi/cors v1.2.2
4949
github.com/go-co-op/gocron v1.37.0
5050
github.com/go-enry/go-enry/v2 v2.9.6
51-
github.com/go-ldap/ldap/v3 v3.4.12
51+
github.com/go-ldap/ldap/v3 v3.4.14
5252
github.com/go-openapi/spec v0.22.6
5353
github.com/go-sql-driver/mysql v1.10.0
5454
github.com/go-webauthn/webauthn v0.16.5
@@ -165,7 +165,7 @@ require (
165165
github.com/fatih/color v1.19.0 // indirect
166166
github.com/fxamacker/cbor/v2 v2.9.1 // indirect
167167
github.com/go-ap/errors v0.0.0-20260208110149-e1b309365966 // indirect
168-
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
168+
github.com/go-asn1-ber/asn1-ber v1.5.8 // indirect
169169
github.com/go-enry/go-oniguruma v1.2.1 // indirect
170170
github.com/go-fed/httpsig v1.1.0 // indirect
171171
github.com/go-ini/ini v1.67.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ github.com/6543/go-version v1.3.1 h1:HvOp+Telns7HWJ2Xo/05YXQSB2bE0WmVgbHqwMPZT4U
6565
github.com/6543/go-version v1.3.1/go.mod h1:oqFAHCwtLVUTLdhQmVZWYvaHXTdsbB4SY85at64SQEo=
6666
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
6767
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
68-
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
69-
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
68+
github.com/Azure/go-ntlmssp v0.1.1 h1:l+FM/EEMb0U9QZE7mKNEDw5Mu3mFiaa2GKOoTSsNDPw=
69+
github.com/Azure/go-ntlmssp v0.1.1/go.mod h1:NYqdhxd/8aAct/s4qSYZEerdPuH1liG2/X9DiVTbhpk=
7070
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
7171
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
7272
github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67IQOfM=
@@ -249,8 +249,8 @@ github.com/go-ap/errors v0.0.0-20260208110149-e1b309365966 h1:tV+3kZgqFMKVUf+JPK
249249
github.com/go-ap/errors v0.0.0-20260208110149-e1b309365966/go.mod h1:zkp58Q5yXpCxZbh3d0GDvwqiYclfVuHEHjc9SZKAj6I=
250250
github.com/go-ap/jsonld v0.0.0-20251216162253-e38fa664ea77 h1:yHAmoR6avNy84PlLmjHt1z9flAp2Qs2ens5QDE/CNWk=
251251
github.com/go-ap/jsonld v0.0.0-20251216162253-e38fa664ea77/go.mod h1:4h93IBxgfnE/DEleMLgJ/XCeu/RtQ+MUh3ucANseeXA=
252-
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo=
253-
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
252+
github.com/go-asn1-ber/asn1-ber v1.5.8 h1:H9AZkK22UOmfX8J84ubyaZxKJZ3FMHVwn8swoMML7iQ=
253+
github.com/go-asn1-ber/asn1-ber v1.5.8/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
254254
github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
255255
github.com/go-chi/chi/v5 v5.3.1 h1:3j4HZLGZQ3JpMCrPJF/Jl3mYJfWLKBfNJ6quurUGCf8=
256256
github.com/go-chi/chi/v5 v5.3.1/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto=
@@ -271,8 +271,8 @@ github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I
271271
github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
272272
github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
273273
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
274-
github.com/go-ldap/ldap/v3 v3.4.12 h1:1b81mv7MagXZ7+1r7cLTWmyuTqVqdwbtJSjC0DAp9s4=
275-
github.com/go-ldap/ldap/v3 v3.4.12/go.mod h1:+SPAGcTtOfmGsCb3h1RFiq4xpp4N636G75OEace8lNo=
274+
github.com/go-ldap/ldap/v3 v3.4.14 h1:D6PYdEgsaVzsXyr6w/yDC06Ria4uUhWm+Rb+er8lfAs=
275+
github.com/go-ldap/ldap/v3 v3.4.14/go.mod h1:S4eJUMUNjDkE0ZJtIZdybwyb03sGGLW6gxXT1Hs8VKA=
276276
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
277277
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
278278
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=

‎services/mailer/mailer.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,19 +157,20 @@ func (a *loginAuth) Next(fromServer []byte, more bool) ([]byte, error) {
157157
}
158158

159159
type ntlmAuth struct {
160-
username, password, domain string
161-
domainNeeded bool
160+
username, password string
162161
}
163162

164163
// NtlmAuth SMTP AUTH NTLM Auth Handler
165164
func NtlmAuth(username, password string) smtp.Auth {
166-
user, domain, domainNeeded := ntlmssp.GetDomain(username)
167-
return &ntlmAuth{user, password, domain, domainNeeded}
165+
return &ntlmAuth{username, password}
168166
}
169167

170168
// Start starts SMTP NTLM Auth
171169
func (a *ntlmAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
172-
negotiateMessage, err := ntlmssp.NewNegotiateMessage(a.domain, "")
170+
// NewNegotiateMessage: Note that domain and workstation refer to the client machine, not the user that is
171+
// authenticating. It is recommended to leave them empty unless you know which are their correct values.
172+
// (https://pkg.go.dev/github.com/Azure/go-ntlmssp#NewNegotiateMessage)
173+
negotiateMessage, err := ntlmssp.NewNegotiateMessage("", "")
173174
return "NTLM", negotiateMessage, err
174175
}
175176

@@ -179,8 +180,7 @@ func (a *ntlmAuth) Next(fromServer []byte, more bool) ([]byte, error) {
179180
if len(fromServer) == 0 {
180181
return nil, errors.New("ntlm ChallengeMessage is empty")
181182
}
182-
authenticateMessage, err := ntlmssp.ProcessChallenge(fromServer, a.username, a.password, a.domainNeeded)
183-
return authenticateMessage, err
183+
return ntlmssp.NewAuthenticateMessage(fromServer, a.username, a.password, nil)
184184
}
185185
return nil, nil
186186
}

0 commit comments

Comments
 (0)