소스 검색

refactor(api): correct status codes

Mustafa Arici 8 년 전
부모
커밋
b2bce683be
3개의 변경된 파일12개의 추가작업 그리고 12개의 파일을 삭제
  1. 1 1
      api/auth.go
  2. 2 2
      api/rpc.go
  3. 9 9
      bindata/bindata.go

+ 1 - 1
api/auth.go

@@ -17,7 +17,7 @@ func authRequired(ctx gcontext.Context, req interface{}, handler grpc.UnaryHandl
 	token, err := authzTokenFromContext(ctx)
 	if err != nil {
 		logrus.Debugln("rpc: auth denied because token can not be gathered from header contest")
-		return nil, grpc.Errorf(codes.InvalidArgument, err.Error())
+		return nil, grpc.Errorf(codes.Unauthenticated, err.Error())
 	}
 	user, err := ovpm.GetUserByToken(token)
 	if err != nil {

+ 2 - 2
api/rpc.go

@@ -41,10 +41,10 @@ func (s *AuthService) Authenticate(ctx context.Context, req *pb.AuthAuthenticate
 
 	user, err := ovpm.GetUser(req.Username)
 	if err != nil {
-		return nil, grpc.Errorf(codes.InvalidArgument, "user not found with the provided credentials")
+		return nil, grpc.Errorf(codes.Unauthenticated, "user not found with the provided credentials")
 	}
 	if !user.CheckPassword(req.Password) {
-		return nil, grpc.Errorf(codes.InvalidArgument, "user not found with the provided credentials")
+		return nil, grpc.Errorf(codes.Unauthenticated, "user not found with the provided credentials")
 	}
 
 	token, err := user.RenewToken()

+ 9 - 9
bindata/bindata.go

@@ -91,7 +91,7 @@ func templateAuthSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/auth.swagger.json", size: 2404, mode: os.FileMode(420), modTime: time.Unix(1505972097, 0)}
+	info := bindataFileInfo{name: "template/auth.swagger.json", size: 2404, mode: os.FileMode(420), modTime: time.Unix(1506003979, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -111,7 +111,7 @@ func templateCcdFileTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/ccd.file.tmpl", size: 229, mode: os.FileMode(420), modTime: time.Unix(1503944154, 0)}
+	info := bindataFileInfo{name: "template/ccd.file.tmpl", size: 229, mode: os.FileMode(420), modTime: time.Unix(1504006286, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -131,7 +131,7 @@ func templateClientOvpnTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/client.ovpn.tmpl", size: 325, mode: os.FileMode(420), modTime: time.Unix(1505858652, 0)}
+	info := bindataFileInfo{name: "template/client.ovpn.tmpl", size: 325, mode: os.FileMode(420), modTime: time.Unix(1505219439, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -151,7 +151,7 @@ func templateDh4096PemTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/dh4096.pem.tmpl", size: 1468, mode: os.FileMode(420), modTime: time.Unix(1503944154, 0)}
+	info := bindataFileInfo{name: "template/dh4096.pem.tmpl", size: 1468, mode: os.FileMode(420), modTime: time.Unix(1503644422, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -171,7 +171,7 @@ func templateIptablesTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/iptables.tmpl", size: 0, mode: os.FileMode(420), modTime: time.Unix(1503944154, 0)}
+	info := bindataFileInfo{name: "template/iptables.tmpl", size: 0, mode: os.FileMode(420), modTime: time.Unix(1503644422, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -191,7 +191,7 @@ func templateNetworkSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/network.swagger.json", size: 7498, mode: os.FileMode(420), modTime: time.Unix(1505972097, 0)}
+	info := bindataFileInfo{name: "template/network.swagger.json", size: 7498, mode: os.FileMode(420), modTime: time.Unix(1506003979, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -211,7 +211,7 @@ func templateServerConfTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/server.conf.tmpl", size: 9599, mode: os.FileMode(420), modTime: time.Unix(1505972023, 0)}
+	info := bindataFileInfo{name: "template/server.conf.tmpl", size: 9599, mode: os.FileMode(420), modTime: time.Unix(1506003819, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -231,7 +231,7 @@ func templateUserSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/user.swagger.json", size: 6532, mode: os.FileMode(420), modTime: time.Unix(1505972097, 0)}
+	info := bindataFileInfo{name: "template/user.swagger.json", size: 6532, mode: os.FileMode(420), modTime: time.Unix(1506003979, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -251,7 +251,7 @@ func templateVpnSwaggerJson() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/vpn.swagger.json", size: 3322, mode: os.FileMode(420), modTime: time.Unix(1505972097, 0)}
+	info := bindataFileInfo{name: "template/vpn.swagger.json", size: 3322, mode: os.FileMode(420), modTime: time.Unix(1506003979, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }