mirror of
https://github.com/decke/smtprelay.git
synced 2025-12-25 16:32:28 -07:00
gofmt: Fix formatting
This commit is contained in:
8
auth.go
8
auth.go
@@ -14,8 +14,8 @@ var (
|
||||
)
|
||||
|
||||
type AuthUser struct {
|
||||
username string
|
||||
passwordHash string
|
||||
username string
|
||||
passwordHash string
|
||||
allowedAddresses []string
|
||||
}
|
||||
|
||||
@@ -48,8 +48,8 @@ func parseLine(line string) *AuthUser {
|
||||
}
|
||||
|
||||
user := AuthUser{
|
||||
username: parts[0],
|
||||
passwordHash: parts[1],
|
||||
username: parts[0],
|
||||
passwordHash: parts[1],
|
||||
allowedAddresses: nil,
|
||||
}
|
||||
|
||||
|
||||
50
auth_test.go
50
auth_test.go
@@ -8,7 +8,7 @@ func stringsEqual(a, b []string) bool {
|
||||
if len(a) != len(b) {
|
||||
return false
|
||||
}
|
||||
for i, _ := range a {
|
||||
for i := range a {
|
||||
if a[i] != b[i] {
|
||||
return false
|
||||
}
|
||||
@@ -18,50 +18,50 @@ func stringsEqual(a, b []string) bool {
|
||||
|
||||
func TestParseLine(t *testing.T) {
|
||||
var tests = []struct {
|
||||
name string
|
||||
name string
|
||||
expectFail bool
|
||||
line string
|
||||
username string
|
||||
addrs []string
|
||||
line string
|
||||
username string
|
||||
addrs []string
|
||||
}{
|
||||
{
|
||||
name: "Empty line",
|
||||
name: "Empty line",
|
||||
expectFail: true,
|
||||
line: "",
|
||||
line: "",
|
||||
},
|
||||
{
|
||||
name: "Too few fields",
|
||||
name: "Too few fields",
|
||||
expectFail: true,
|
||||
line: "joe",
|
||||
line: "joe",
|
||||
},
|
||||
{
|
||||
name: "Too many fields",
|
||||
name: "Too many fields",
|
||||
expectFail: true,
|
||||
line: "joe xxx joe@example.com whatsthis",
|
||||
line: "joe xxx joe@example.com whatsthis",
|
||||
},
|
||||
{
|
||||
name: "Normal case",
|
||||
line: "joe xxx joe@example.com",
|
||||
name: "Normal case",
|
||||
line: "joe xxx joe@example.com",
|
||||
username: "joe",
|
||||
addrs: []string{"joe@example.com"},
|
||||
addrs: []string{"joe@example.com"},
|
||||
},
|
||||
{
|
||||
name: "No allowed addrs given",
|
||||
line: "joe xxx",
|
||||
name: "No allowed addrs given",
|
||||
line: "joe xxx",
|
||||
username: "joe",
|
||||
addrs: []string{},
|
||||
addrs: []string{},
|
||||
},
|
||||
{
|
||||
name: "Trailing comma",
|
||||
line: "joe xxx joe@example.com,",
|
||||
name: "Trailing comma",
|
||||
line: "joe xxx joe@example.com,",
|
||||
username: "joe",
|
||||
addrs: []string{"joe@example.com"},
|
||||
addrs: []string{"joe@example.com"},
|
||||
},
|
||||
{
|
||||
name: "Multiple allowed addrs",
|
||||
line: "joe xxx joe@example.com,@foo.example.com",
|
||||
name: "Multiple allowed addrs",
|
||||
line: "joe xxx joe@example.com,@foo.example.com",
|
||||
username: "joe",
|
||||
addrs: []string{"joe@example.com", "@foo.example.com"},
|
||||
addrs: []string{"joe@example.com", "@foo.example.com"},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -77,12 +77,12 @@ func TestParseLine(t *testing.T) {
|
||||
|
||||
if user.username != test.username {
|
||||
t.Errorf("Testcase %d: Incorrect username: expected %v, got %v",
|
||||
i, test.username, user.username)
|
||||
i, test.username, user.username)
|
||||
}
|
||||
|
||||
if !stringsEqual(user.allowedAddresses, test.addrs) {
|
||||
t.Errorf("Testcase %d: Incorrect addresses: expected %v, got %v",
|
||||
i, test.addrs, user.allowedAddresses)
|
||||
i, test.addrs, user.allowedAddresses)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
22
main_test.go
22
main_test.go
@@ -24,17 +24,17 @@ func TestAddrAllowedSingle(t *testing.T) {
|
||||
|
||||
func TestAddrAllowedDifferentCase(t *testing.T) {
|
||||
allowedAddrs := []string{"joe@abc.com"}
|
||||
testAddrs := []string{
|
||||
"joe@ABC.com",
|
||||
"Joe@abc.com",
|
||||
"JOE@abc.com",
|
||||
"JOE@ABC.COM",
|
||||
}
|
||||
for _, addr := range testAddrs {
|
||||
if !addrAllowed(addr, allowedAddrs) {
|
||||
t.Errorf("Address %v not allowed, but should be", addr)
|
||||
}
|
||||
}
|
||||
testAddrs := []string{
|
||||
"joe@ABC.com",
|
||||
"Joe@abc.com",
|
||||
"JOE@abc.com",
|
||||
"JOE@ABC.COM",
|
||||
}
|
||||
for _, addr := range testAddrs {
|
||||
if !addrAllowed(addr, allowedAddrs) {
|
||||
t.Errorf("Address %v not allowed, but should be", addr)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddrAllowedLocal(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user