Skip to content
Snippets Groups Projects
Commit 4ef5a9d9 authored by Olgun Cengiz's avatar Olgun Cengiz :drum:
Browse files

MaxMessageSize added

parent 4fe6ff89
No related branches found
No related tags found
4 merge requests!19Ci,!18Resolve "142-Implement_CA_cert",!17Resolve "Configurable MaxMessageSize",!16Resolve "Configurable MaxMessageSize"
...@@ -7,4 +7,7 @@ certDir: cert ...@@ -7,4 +7,7 @@ certDir: cert
certFile: server.crt certFile: server.crt
certKey: server.key certKey: server.key
vereignCertFile: vereign_ca.cer vereignCertFile: vereign_ca.cer
vereignCertKey: vereign_ca.key vereignCertKey: vereign_ca.key
\ No newline at end of file
# Maximum Message Size (in megabytes)
maxMessageSize: 32
\ No newline at end of file
...@@ -39,7 +39,7 @@ func (s *KeyStorageServerImpl) GenerateKeyPair(ctx context.Context, ...@@ -39,7 +39,7 @@ func (s *KeyStorageServerImpl) GenerateKeyPair(ctx context.Context,
auth := s.CreateAuthentication(ctx) auth := s.CreateAuthentication(ctx)
client := &client.DataStorageClientImpl{} client := &client.DataStorageClientImpl{}
client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath) client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath, s.MaxMessageSize)
defer client.CloseClient() defer client.CloseClient()
generateKeyPairResponse := &api.GenerateKeyPairResponse{} generateKeyPairResponse := &api.GenerateKeyPairResponse{}
......
...@@ -38,6 +38,7 @@ type KeyStorageServerImpl struct { ...@@ -38,6 +38,7 @@ type KeyStorageServerImpl struct {
CertFilePath string CertFilePath string
VereignCertFilePath string VereignCertFilePath string
VereignPrivateKeyFilePath string VereignPrivateKeyFilePath string
MaxMessageSize int
} }
func (s *KeyStorageServerImpl) CreateAuthentication(ctx context.Context) *authentication.Authentication { func (s *KeyStorageServerImpl) CreateAuthentication(ctx context.Context) *authentication.Authentication {
...@@ -60,7 +61,7 @@ func (s *KeyStorageServerImpl) GetKey(ctx context.Context, in *api.GetKeyRequest ...@@ -60,7 +61,7 @@ func (s *KeyStorageServerImpl) GetKey(ctx context.Context, in *api.GetKeyRequest
auth := s.CreateAuthentication(ctx) auth := s.CreateAuthentication(ctx)
client := &client.DataStorageClientImpl{} client := &client.DataStorageClientImpl{}
client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath) client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath, s.MaxMessageSize)
defer client.CloseClient() defer client.CloseClient()
getKeyResponse := &api.GetKeyResponse{} getKeyResponse := &api.GetKeyResponse{}
...@@ -107,7 +108,7 @@ func (s *KeyStorageServerImpl) SetKey(ctx context.Context, in *api.SetKeyRequest ...@@ -107,7 +108,7 @@ func (s *KeyStorageServerImpl) SetKey(ctx context.Context, in *api.SetKeyRequest
auth := s.CreateAuthentication(ctx) auth := s.CreateAuthentication(ctx)
client := &client.DataStorageClientImpl{} client := &client.DataStorageClientImpl{}
client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath) client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath, s.MaxMessageSize)
defer client.CloseClient() defer client.CloseClient()
setKeyResponse := &api.SetKeyResponse{} setKeyResponse := &api.SetKeyResponse{}
...@@ -155,7 +156,7 @@ func (s *KeyStorageServerImpl) ReserveKeyUUID(ctx context.Context, in *api.Reser ...@@ -155,7 +156,7 @@ func (s *KeyStorageServerImpl) ReserveKeyUUID(ctx context.Context, in *api.Reser
auth := s.CreateAuthentication(ctx) auth := s.CreateAuthentication(ctx)
client := &client.DataStorageClientImpl{} client := &client.DataStorageClientImpl{}
client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath) client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath, s.MaxMessageSize)
defer client.CloseClient() defer client.CloseClient()
reserveKeyUUIDResponse := &api.ReserveKeyUUIDResponse{} reserveKeyUUIDResponse := &api.ReserveKeyUUIDResponse{}
......
...@@ -29,7 +29,7 @@ func (s *KeyStorageServerImpl) Revoke(ctx context.Context, in *api.RevokeRequest ...@@ -29,7 +29,7 @@ func (s *KeyStorageServerImpl) Revoke(ctx context.Context, in *api.RevokeRequest
auth := s.CreateAuthentication(ctx) auth := s.CreateAuthentication(ctx)
client := &client.DataStorageClientImpl{} client := &client.DataStorageClientImpl{}
client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath) client.SetUpClient(auth, s.DataStorageUrl, s.CertFilePath, s.MaxMessageSize)
defer client.CloseClient() defer client.CloseClient()
revokeResponse := &api.RevokeResponse{} revokeResponse := &api.RevokeResponse{}
......
...@@ -44,10 +44,12 @@ func main() { ...@@ -44,10 +44,12 @@ func main() {
vereignCertFilePath := certDir + "/" + viper.GetString("vereignCertFile") vereignCertFilePath := certDir + "/" + viper.GetString("vereignCertFile")
vereignPrivateKeyFilePath := certDir + "/" + viper.GetString("vereignCertKey") vereignPrivateKeyFilePath := certDir + "/" + viper.GetString("vereignCertKey")
maxMessageSize := viper.GetInt("maxMessageSize")
// fire the gRPC server in a goroutine // fire the gRPC server in a goroutine
go func() { go func() {
err := server.StartGRPCServer(grpcAddress, certFilePath, privateKeyFilePath, vereignCertFilePath, err := server.StartGRPCServer(grpcAddress, certFilePath, privateKeyFilePath, vereignCertFilePath,
vereignPrivateKeyFilePath, dataStorageAddress) vereignPrivateKeyFilePath, dataStorageAddress, maxMessageSize)
if err != nil { if err != nil {
log.Fatalf("failed to start gRPC server: %s", err) log.Fatalf("failed to start gRPC server: %s", err)
} }
......
...@@ -20,6 +20,8 @@ func SetConfigValues() { ...@@ -20,6 +20,8 @@ func SetConfigValues() {
viper.SetDefault("vereignCertFile", "vereign_ca.cer") viper.SetDefault("vereignCertFile", "vereign_ca.cer")
viper.SetDefault("vereignCertKey", "vereign_ca.key") viper.SetDefault("vereignCertKey", "vereign_ca.key")
viper.SetDefault("maxMessageSize", "32")
// Read Config File // Read Config File
viper.SetConfigName("config") viper.SetConfigName("config")
viper.AddConfigPath(".") viper.AddConfigPath(".")
......
...@@ -70,7 +70,7 @@ func authenticateClient(ctx context.Context, s *handler.KeyStorageServerImpl, in ...@@ -70,7 +70,7 @@ func authenticateClient(ctx context.Context, s *handler.KeyStorageServerImpl, in
} }
sessionClient := &client.DataStorageClientImpl{} sessionClient := &client.DataStorageClientImpl{}
sessionClient.SetUpClient(viamAuth, viper.GetString("dataStorageClientUrl"), pkgCertFile) sessionClient.SetUpClient(viamAuth, viper.GetString("dataStorageClientUrl"), pkgCertFile, viper.GetInt("maxMessageSize"))
defer sessionClient.CloseClient() defer sessionClient.CloseClient()
if clientAuth.Uuid == viamAuth.Uuid { if clientAuth.Uuid == viamAuth.Uuid {
...@@ -107,7 +107,7 @@ func unaryInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServ ...@@ -107,7 +107,7 @@ func unaryInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServ
return handler1(ctx, req) return handler1(ctx, req)
} }
func StartGRPCServer(address, certFilePath, privateKeyFilePath, vereignCertFilePath, vereignPrivateKeyFilePath, dataStorageAddress string) error { func StartGRPCServer(address, certFilePath, privateKeyFilePath, vereignCertFilePath, vereignPrivateKeyFilePath, dataStorageAddress string, maxMessageSize int) error {
pkgCertFile = certFilePath pkgCertFile = certFilePath
// create a listener on TCP port // create a listener on TCP port
...@@ -122,6 +122,7 @@ func StartGRPCServer(address, certFilePath, privateKeyFilePath, vereignCertFileP ...@@ -122,6 +122,7 @@ func StartGRPCServer(address, certFilePath, privateKeyFilePath, vereignCertFileP
CertFilePath: certFilePath, CertFilePath: certFilePath,
VereignCertFilePath: vereignCertFilePath, VereignCertFilePath: vereignCertFilePath,
VereignPrivateKeyFilePath: vereignPrivateKeyFilePath, VereignPrivateKeyFilePath: vereignPrivateKeyFilePath,
MaxMessageSize: maxMessageSize,
} }
// Create the TLS credentials // Create the TLS credentials
...@@ -131,8 +132,11 @@ func StartGRPCServer(address, certFilePath, privateKeyFilePath, vereignCertFileP ...@@ -131,8 +132,11 @@ func StartGRPCServer(address, certFilePath, privateKeyFilePath, vereignCertFileP
} }
// Create an array of gRPC options with the credentials // Create an array of gRPC options with the credentials
opts := []grpc.ServerOption{grpc.Creds(creds), opts := []grpc.ServerOption{
grpc.UnaryInterceptor(unaryInterceptor)} grpc.Creds(creds),
grpc.UnaryInterceptor(unaryInterceptor),
grpc.MaxRecvMsgSize(viper.GetInt("maxMessageSize")*1024*1024),
}
// create a gRPC server object // create a gRPC server object
grpcServer := grpc.NewServer(opts...) grpcServer := grpc.NewServer(opts...)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment