mirror of
https://github.com/PretendoNetwork/super-mario-maker.git
synced 2026-08-01 16:04:45 -05:00
Merge a0d765c87e into 85673ae9f8
This commit is contained in:
commit
d1663b5f04
|
|
@ -60,6 +60,8 @@ All configuration options are handled via environment variables
|
|||
| `PN_SMM_CONFIG_S3_ACCESS_SECRET` | S3 secret | Yes |
|
||||
| `PN_SMM_CONFIG_S3_BUCKET` | S3 bucket | Yes |
|
||||
| `PN_SMM_CONFIG_S3_KEY_BASE` | S3 Key prefix | Yes |
|
||||
| `PN_SMM_GRPC_SERVER_PORT` | Port for the GRPC server | Yes |
|
||||
| `PN_SMM_GRPC_API_KEY` | API key for your GRPC server | No (Assumed to be an open gRPC API) |
|
||||
| `PN_SMM_ACCOUNT_GRPC_HOST` | Host name for your account server gRPC service | Yes |
|
||||
| `PN_SMM_ACCOUNT_GRPC_PORT` | Port for your account server gRPC service | Yes |
|
||||
| `PN_SMM_ACCOUNT_GRPC_API_KEY` | API key for your account server gRPC service | No (Assumed to be an open gRPC API) |
|
||||
|
|
|
|||
|
|
@ -22,3 +22,5 @@ var GRPCAccountClient pb.AccountClient
|
|||
var GRPCAccountCommonMetadata metadata.MD
|
||||
var MinIOClient *minio.Client
|
||||
var Presigner *S3Presigner
|
||||
var GRPCAPIKey string
|
||||
var GRPCServerPort int
|
||||
|
|
|
|||
26
grpc/api_key_interceptor.go
Normal file
26
grpc/api_key_interceptor.go
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
package grpc
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
|
||||
"github.com/PretendoNetwork/super-mario-maker/globals"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/metadata"
|
||||
)
|
||||
|
||||
func apiKeyInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
|
||||
md, ok := metadata.FromIncomingContext(ctx)
|
||||
|
||||
if ok {
|
||||
apiKeyHeader := md.Get("X-API-Key")
|
||||
|
||||
if len(apiKeyHeader) == 0 || apiKeyHeader[0] != globals.GRPCAPIKey {
|
||||
return nil, errors.New("Missing or invalid API key")
|
||||
}
|
||||
}
|
||||
|
||||
h, err := handler(ctx, req)
|
||||
|
||||
return h, err
|
||||
}
|
||||
42
grpc/delete_course.go
Normal file
42
grpc/delete_course.go
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
package grpc
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/status"
|
||||
|
||||
pb "github.com/PretendoNetwork/grpc/go/smm"
|
||||
datastore_db "github.com/PretendoNetwork/super-mario-maker/database/datastore"
|
||||
"github.com/PretendoNetwork/super-mario-maker/globals"
|
||||
)
|
||||
|
||||
func (s *gRPCSMMServer) DeleteCourse(ctx context.Context, in *pb.DeleteCourseRequest) (*pb.DeleteCourseResponse, error) {
|
||||
err := datastore_db.IsObjectAvailable(in.DataID)
|
||||
if err != nil {
|
||||
return &pb.DeleteCourseResponse{
|
||||
Success: false,
|
||||
}, status.Errorf(codes.NotFound, "Course not found")
|
||||
}
|
||||
|
||||
metaInfo, err := datastore_db.GetObjectInfoByDataID(in.DataID)
|
||||
if err != nil {
|
||||
globals.Logger.Critical(err.Error())
|
||||
return &pb.DeleteCourseResponse{
|
||||
Success: false,
|
||||
}, status.Errorf(codes.Internal, "internal server error")
|
||||
}
|
||||
|
||||
err = datastore_db.DeleteObjectByDataID(in.DataID)
|
||||
if err != nil {
|
||||
globals.Logger.Critical(err.Error())
|
||||
return &pb.DeleteCourseResponse{
|
||||
Success: false,
|
||||
}, status.Errorf(codes.Internal, "internal server error")
|
||||
}
|
||||
|
||||
return &pb.SendUserFriendRequestResponse{
|
||||
CourseName: metaInfo.Name,
|
||||
Success: true,
|
||||
}, nil
|
||||
}
|
||||
34
grpc/grpc_server.go
Normal file
34
grpc/grpc_server.go
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
package grpc
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net"
|
||||
|
||||
pb "github.com/PretendoNetwork/grpc/go/smm"
|
||||
"github.com/PretendoNetwork/super-mario-maker/globals"
|
||||
"google.golang.org/grpc"
|
||||
)
|
||||
|
||||
type gRPCSMMServer struct {
|
||||
pb.UnimplementedSMMServer
|
||||
}
|
||||
|
||||
func StartGRPCServer() {
|
||||
listener, err := net.Listen("tcp", fmt.Sprintf(":%d", globals.GRPCServerPort))
|
||||
if err != nil {
|
||||
log.Fatalf("failed to listen: %v", err)
|
||||
}
|
||||
|
||||
server := grpc.NewServer(
|
||||
grpc.UnaryInterceptor(apiKeyInterceptor),
|
||||
)
|
||||
|
||||
pb.RegisterSMMServer(server, &gRPCSMMServer{})
|
||||
|
||||
log.Printf("server listening at %v", listener.Addr())
|
||||
|
||||
if err := server.Serve(listener); err != nil {
|
||||
log.Fatalf("failed to serve: %v", err)
|
||||
}
|
||||
}
|
||||
17
init.go
17
init.go
|
|
@ -41,6 +41,8 @@ func init() {
|
|||
authenticationServerPort := os.Getenv("PN_SMM_AUTHENTICATION_SERVER_PORT")
|
||||
secureServerHost := os.Getenv("PN_SMM_SECURE_SERVER_HOST")
|
||||
secureServerPort := os.Getenv("PN_SMM_SECURE_SERVER_PORT")
|
||||
gRPCServerPort := os.Getenv("PN_SMM_GRPC_SERVER_PORT")
|
||||
gRPCAPIKey := os.Getenv("PN_SMM_GRPC_API_KEY")
|
||||
accountGRPCHost := os.Getenv("PN_SMM_ACCOUNT_GRPC_HOST")
|
||||
accountGRPCPort := os.Getenv("PN_SMM_ACCOUNT_GRPC_PORT")
|
||||
accountGRPCAPIKey := os.Getenv("PN_SMM_ACCOUNT_GRPC_API_KEY")
|
||||
|
|
@ -93,6 +95,21 @@ func init() {
|
|||
os.Exit(0)
|
||||
}
|
||||
|
||||
gRPCPort, err := strconv.Atoi(gRPCServerPort)
|
||||
if err != nil {
|
||||
globals.Logger.Errorf("PN_SMM_GRPC_SERVER_PORT is not a valid port. Expected 0-65535, got %s", gRPCServerPort)
|
||||
os.Exit(0)
|
||||
} else if gRPCPort < 0 || gRPCPort > 65535 {
|
||||
globals.Logger.Errorf("PN_SMM_GRPC_SERVER_PORT is not a valid port. Expected 0-65535, got %s", gRPCServerPort)
|
||||
os.Exit(0)
|
||||
}
|
||||
globals.GRPCServerPort = gRPCPort;
|
||||
|
||||
if strings.TrimSpace(gRPCAPIKey) == "" {
|
||||
globals.Logger.Warning("Insecure gRPC server detected. PN_SMM_GRPC_API_KEY environment variable not set")
|
||||
}
|
||||
globals.GRPCAPIKey = gRPCAPIKey;
|
||||
|
||||
if strings.TrimSpace(accountGRPCHost) == "" {
|
||||
globals.Logger.Error("PN_SMM_ACCOUNT_GRPC_HOST environment variable not set")
|
||||
os.Exit(0)
|
||||
|
|
|
|||
3
main.go
3
main.go
|
|
@ -3,6 +3,7 @@ package main
|
|||
import (
|
||||
"sync"
|
||||
|
||||
"github.com/PretendoNetwork/super-mario-maker/grpc"
|
||||
"github.com/PretendoNetwork/super-mario-maker/nex"
|
||||
)
|
||||
|
||||
|
|
@ -11,7 +12,7 @@ var wg sync.WaitGroup
|
|||
func main() {
|
||||
wg.Add(2)
|
||||
|
||||
// TODO - Add gRPC server
|
||||
go grpc.StartGRPCServer()
|
||||
go nex.StartAuthenticationServer()
|
||||
go nex.StartSecureServer()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user