Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2026-01-09 17:55:57 +00:00
Code Releases Activity

Minor style and simplification cleanups

Browse Source 
This patch does various minor style and simplification cleanups, fixing things
detected by tools such as go vet, gofmt -s, and golint.

There are no functional changes, this change is purely cosmetic, but will
enable us to run those tools more regularly now that their output is clean.
This commit is contained in:
Alberto Bertogli
2016-08-01 22:49:27 +01:00
parent 92a88bd06f
commit aac2d3c061
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/userdb/userdb.go
View File

@@ -75,8 +75,8 @@ type DB struct {
}
var (
MissingHeaderErr = errors.New("missing '#chasquid-userdb-v1' header")
InvalidUsernameErr = errors.New("username contains invalid characters")
ErrMissingHeader = errors.New("missing '#chasquid-userdb-v1' header")
ErrInvalidUsername = errors.New("username contains invalid characters")
)
func New(fname string) *DB {
@@ -114,7 +114,7 @@ func Load(fname string) (*DB, []error, error) {
scanner := bufio.NewScanner(f)
scanner.Scan()
if scanner.Text() != "#chasquid-userdb-v1" {
return nil, nil, MissingHeaderErr
return nil, nil, ErrMissingHeader
}
var warnings []error
@@ -194,7 +194,7 @@ func (db *DB) Write() error {
// TODO: Sort the usernames, just to be friendlier.
for _, user := range db.users {
if strings.ContainsAny(user.name, illegalUsernameChars) {
return InvalidUsernameErr
return ErrInvalidUsername
}
fmt.Fprintf(buf, "%s %s %s\n",
user.name, user.scheme.String(),
@@ -247,7 +247,7 @@ const illegalUsernameChars = "\t\n\v\f\r \xa0\x85"
// Add a user to the database. If the user is already present, override it.
func (db *DB) AddUser(name, plainPassword string) error {
if !ValidUsername(name) {
return InvalidUsernameErr
return ErrInvalidUsername
}
s := scryptScheme{

4
internal/userdb/userdb_test.go
View File

@@ -86,7 +86,7 @@ func TestLoad(t *testing.T) {
{"header \\r\\n", "#chasquid-userdb-v1\r\n", false, nil, false},
{"header EOF", "#chasquid-userdb-v1", false, nil, false},
{"missing header", "this is not the header",
true, MissingHeaderErr, false},
true, ErrMissingHeader, false},
{"invalid user", "#chasquid-userdb-v1\nnam\xa0e PLAIN pass\n",
false, nil, true},
{"too few fields", "#chasquid-userdb-v1\nfield1 field2\n",
@@ -131,7 +131,7 @@ func testOneLoad(t *testing.T, desc, content string, fatal bool, fatalErr error,
}
if db != nil && !dbEquals(db, emptyDB) {
t.Errorf("case %q: DB not empty: %#v", db)
t.Errorf("case %q: DB not empty: %#v", desc, db)
}
}