working commit
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
package config
|
||||
|
||||
const (
|
||||
confdirPath = "/home/ziggi/Projects/grpcbase/etc/mbase"
|
||||
rundirPath = "/home/ziggi/Projects/grpcbase/tmp/run"
|
||||
logdirPath = "/home/ziggi/Projects/grpcbase/tmp/log"
|
||||
datadirPath = "/home/ziggi/Projects/grpcbase/tmp/data"
|
||||
confdirPath = "/home/ziggi/Projects/gmbase/etc/mbase"
|
||||
rundirPath = "/home/ziggi/Projects/gmbase/tmp/run"
|
||||
logdirPath = "/home/ziggi/Projects/gmbase/tmp/log"
|
||||
datadirPath = "/home/ziggi/Projects/gmbase/tmp/data"
|
||||
packageVersion = "0.0.1"
|
||||
)
|
||||
|
||||
@@ -17,12 +17,14 @@ func (hand *Handler) Authentificate(ctx context.Context) (string, error) {
|
||||
meta, _ := metadata.FromIncomingContext(ctx)
|
||||
usernameArr := meta["username"]
|
||||
passwordArr := meta["password"]
|
||||
|
||||
if len(usernameArr) == 0 || len(passwordArr) == 0 {
|
||||
err := status.Errorf(codes.PermissionDenied, "Empty auth data")
|
||||
return accountID, err
|
||||
}
|
||||
username := meta["username"][0]
|
||||
password := meta["password"][0]
|
||||
//hand.log.Debugf("Auth pair: [%s:%s]", username, password)
|
||||
validated, accountID, err := hand.oper.ValidateAccount(ctx, username, password)
|
||||
if !validated {
|
||||
err := status.Errorf(codes.PermissionDenied, "Wrong auth data")
|
||||
|
||||
@@ -49,7 +49,7 @@ func NewDatabase(datapath string) (*Database, error) {
|
||||
db := &Database{
|
||||
datapath: datapath,
|
||||
}
|
||||
db.log = logger.NewLogger("database")
|
||||
db.log = logger.NewLogger("maindb")
|
||||
return db, err
|
||||
|
||||
}
|
||||
|
||||
@@ -86,12 +86,10 @@ func (svc *Service) Run() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
interceptors := []grpc.UnaryServerInterceptor{
|
||||
svc.accessInterceptor,
|
||||
svc.logInterceptor,
|
||||
}
|
||||
|
||||
gsrvOpts := []grpc.ServerOption{
|
||||
grpc.Creds(tlsCredentials),
|
||||
grpc.ChainUnaryInterceptor(interceptors...),
|
||||
@@ -114,7 +112,6 @@ func (svc *Service) accessInterceptor(ctx context.Context, req any, info *grpc.U
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
addressEnabled, _ := svc.nacl.AddressIsEnabled(host)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user