mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-17 19:48:35 +02:00
Revert "Implement IAM propagation to S3 servers (#8130)"
This reverts commit 551a31e156.
This commit is contained in:
1 parent
6389a40088
commit
62c4ef3536
26 files changed
+1206
-1726
No files matched your search
@@ -256,10 +256,6 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption)
|
||||
|
||||
fs.filer.Dlm.LockRing.SetTakeSnapshotCallback(fs.OnDlmChangeSnapshot)
|
||||
|
||||
if fs.CredentialManager != nil {
|
||||
fs.CredentialManager.SetMasterClient(fs.filer.MasterClient, fs.grpcDialOption)
|
||||
}
|
||||
|
||||
return fs, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ func (s *IamGrpcServer) CreateUser(ctx context.Context, req *iam_pb.CreateUserRe
|
||||
if req == nil || req.Identity == nil {
|
||||
return nil, status.Errorf(codes.InvalidArgument, "identity is required")
|
||||
}
|
||||
glog.V(4).Infof("IAM: Filer.CreateUser %s", req.Identity.Name)
|
||||
glog.V(4).Infof("CreateUser: %s", req.Identity.Name)
|
||||
|
||||
if s.credentialManager == nil {
|
||||
return nil, status.Errorf(codes.FailedPrecondition, "credential manager is not configured")
|
||||
@@ -113,10 +113,10 @@ func (s *IamGrpcServer) GetUser(ctx context.Context, req *iam_pb.GetUserRequest)
|
||||
}
|
||||
|
||||
func (s *IamGrpcServer) UpdateUser(ctx context.Context, req *iam_pb.UpdateUserRequest) (*iam_pb.UpdateUserResponse, error) {
|
||||
glog.V(4).Infof("UpdateUser: %s", req.Username)
|
||||
if req == nil || req.Identity == nil {
|
||||
return nil, status.Errorf(codes.InvalidArgument, "identity is required")
|
||||
}
|
||||
glog.V(4).Infof("IAM: Filer.UpdateUser %s", req.Username)
|
||||
|
||||
if s.credentialManager == nil {
|
||||
return nil, status.Errorf(codes.FailedPrecondition, "credential manager is not configured")
|
||||
@@ -135,7 +135,7 @@ func (s *IamGrpcServer) UpdateUser(ctx context.Context, req *iam_pb.UpdateUserRe
|
||||
}
|
||||
|
||||
func (s *IamGrpcServer) DeleteUser(ctx context.Context, req *iam_pb.DeleteUserRequest) (*iam_pb.DeleteUserResponse, error) {
|
||||
glog.V(4).Infof("IAM: Filer.DeleteUser %s", req.Username)
|
||||
glog.V(4).Infof("DeleteUser: %s", req.Username)
|
||||
|
||||
if s.credentialManager == nil {
|
||||
return nil, status.Errorf(codes.FailedPrecondition, "credential manager is not configured")
|
||||
@@ -243,7 +243,7 @@ func (s *IamGrpcServer) GetUserByAccessKey(ctx context.Context, req *iam_pb.GetU
|
||||
// Policy Management
|
||||
|
||||
func (s *IamGrpcServer) PutPolicy(ctx context.Context, req *iam_pb.PutPolicyRequest) (*iam_pb.PutPolicyResponse, error) {
|
||||
glog.V(4).Infof("IAM: Filer.PutPolicy %s", req.Name)
|
||||
glog.V(4).Infof("PutPolicy: %s", req.Name)
|
||||
|
||||
if s.credentialManager == nil {
|
||||
return nil, status.Errorf(codes.FailedPrecondition, "credential manager is not configured")
|
||||
|
||||
@@ -276,7 +276,6 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ
|
||||
|
||||
clientName, messageChan := ms.addClient(req.FilerGroup, req.ClientType, peerAddress)
|
||||
for _, update := range ms.Cluster.AddClusterNode(req.FilerGroup, req.ClientType, cluster.DataCenter(req.DataCenter), cluster.Rack(req.Rack), peerAddress, req.Version) {
|
||||
glog.V(1).Infof("Cluster: %s node %s added to group '%s'", req.ClientType, peerAddress, req.FilerGroup)
|
||||
ms.broadcastToClients(update)
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user