浏览代码

[GIN] Remove old email block function

Achilleas Koutsou 4 年之前
父节点
当前提交
de4f55b50a
共有 2 个文件被更改,包括 0 次插入29 次删除
  1. 0 25
      internal/db/db_gin.go
  2. 0 4
      internal/db/user.go

+ 0 - 25
internal/db/db_gin.go

@@ -228,31 +228,6 @@ func isAddressAllowed(email string) bool {
 	return true
 }
 
-func IsBlockedDomain(email string) bool {
-	fpath := filepath.Join(conf.CustomDir(), "blocklist")
-	if !com.IsExist(fpath) {
-		return false
-	}
-
-	f, err := os.Open(fpath)
-	if err != nil {
-		log.Error(2, "Failed to open file %q: %v", fpath, err)
-		return false
-	}
-	defer f.Close()
-
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		// Check provided email address against each line as suffix
-		if strings.HasSuffix(email, scanner.Text()) {
-			log.Trace("New user email matched blocked domain: %q", email)
-			return true
-		}
-	}
-
-	return false
-}
-
 func (u *User) OldGinVerifyPassword(plain string) bool {
 	err := bcrypt.CompareHashAndPassword([]byte(u.Passwd), []byte(plain))
 	return err == nil

+ 0 - 4
internal/db/user.go

@@ -584,10 +584,6 @@ func CreateUser(u *User) (err error) {
 		return ErrEmailAlreadyUsed{args: errutil.Args{"email": u.Email}}
 	}
 
-	if IsBlockedDomain(u.Email) {
-		return ErrBlockedDomain{u.Email}
-	}
-
 	if !isAddressAllowed(u.Email) {
 		return ErrBlockedDomain{u.Email}
 	}