infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-10 07:14:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

add scram-sha-256 for smtp

Browse Source 
similar to imap. the code should be merged.
this also reads the abort-line after authentication failure.
This commit is contained in:
Mechiel Lukkien
2023-01-31 00:22:26 +01:00
parent b40bb257d7
commit 020d0bb0fb
5 changed files with 128 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
smtpserver/parse.go
View File

@ -139,6 +139,21 @@ func (p *parser) takefn1(what string, fn func(c rune, i int) bool) string {
return p.remainder()
}
func (p *parser) takefn1case(what string, fn func(c rune, i int) bool) string {
if p.empty() {
p.xerrorf("need at least one char for %s", what)
}
for i, c := range p.orig[p.o:] {
if !fn(c, i) {
if i == 0 {
p.xerrorf("expected at least one char for %s", what)
}
return p.xtaken(i)
}
}
return p.remainder()
}
func (p *parser) takefn(fn func(c rune, i int) bool) string {
for i, c := range p.upper[p.o:] {
if !fn(c, i) {
@ -413,7 +428,7 @@ func (p *parser) xnumber(maxDigits int) int64 {
// sasl mechanism, for AUTH command.
// ../rfc/4422:436
func (p *parser) xsaslMech() string {
return p.takefn1("sasl-mech", func(c rune, i int) bool {
return p.takefn1case("sasl-mech", func(c rune, i int) bool {
return i < 20 && (c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c == '-' || c == '_')
})
}