Merge branch 'master' into kd-live

core/maingate.go

@@ -13,6 +13,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"runtime/debug"
 	"strings"
 	"sync/atomic"
 	"time"
@@ -169,7 +170,8 @@ type Maingate struct {
 	//services               servicelist
 	serviceptr unsafe.Pointer
 	admins     unsafe.Pointer
-	wl         whitelist
+	wl         memberContainerPtr[string, *whitelistmember]
+	bl         memberContainerPtr[primitive.ObjectID, *blockinfo]
 
 	tokenEndpoints         map[string]string
 	authorizationEndpoints map[string]string
@@ -206,7 +208,6 @@ func New(ctx context.Context) (*Maingate, error) {
 
 	err := mg.prepare(ctx)
 	if err != nil {
-		logger.Error("mg.prepare() failed :", err)
 		return nil, err
 	}
 
@@ -286,106 +287,104 @@ func (mg *Maingate) discoverOpenIdConfiguration(name string, url string) error {
 
 }
 
+func makeErrorWithStack(err error) error {
+	return fmt.Errorf("%s\n%s", err.Error(), string(debug.Stack()))
+}
+
 func (mg *Maingate) prepare(context context.Context) (err error) {
 	if err := mg.discoverOpenIdConfiguration(AuthPlatformMicrosoft, "https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration"); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 	if err := mg.discoverOpenIdConfiguration("google", "https://accounts.google.com/.well-known/openid-configuration"); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	// redis에서 env를 가져온 후에
 	mg.mongoClient, err = gocommon.NewMongoClient(context, mg.Mongo, "maingate")
 	if err != nil {
+		return makeErrorWithStack(err)
+	}
+
+	if err = mg.mongoClient.MakeUniqueIndices(CollectionCouponUse, map[string]bson.D{
+		"idrounds": {{Key: "_id", Value: 1}, {Key: "rounds", Value: 1}},
+	}); err != nil {
 		return err
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionAuth, map[string]bson.D{
 		"skonly": {{Key: "sk", Value: 1}},
 	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionLink, map[string]bson.D{
 		"platformuid": {{Key: "platform", Value: 1}, {Key: "uid", Value: 1}},
 	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionLink, map[string]bson.D{
 		"emailplatform": {{Key: "email", Value: 1}, {Key: "platform", Value: 1}},
 	}); err != nil {
-		return err
-	}
-
-	if err = mg.mongoClient.MakeIndices(CollectionWhitelist, map[string]bson.D{
-		"service": {{Key: "service", Value: 1}},
-	}); err != nil {
-		return err
-	}
-
-	if err = mg.mongoClient.MakeIndices(CollectionFile, map[string]bson.D{
-		"service": {{Key: "service", Value: 1}},
-	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeIndices(CollectionAccount, map[string]bson.D{
 		"accid": {{Key: "accid", Value: 1}},
 	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionFile, map[string]bson.D{
-		"sk": {{Key: "service", Value: 1}, {Key: "key", Value: 1}},
+		"keyonly": {{Key: "key", Value: 1}},
 	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
+	// Delete대신 _ts로 expire시킴. pipeline에 삭제 알려주기 위함
 	if err = mg.mongoClient.MakeExpireIndex(CollectionWhitelist, 10); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeExpireIndex(CollectionAuth, int32(mg.SessionTTL+300)); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
-	if err = mg.mongoClient.MakeUniqueIndices(CollectionBlock, map[string]bson.D{
-		"codeaccid": {{Key: "code", Value: 1}, {Key: "accid", Value: 1}},
-	}); err != nil {
-		return err
+	if *devflag {
+		// 에러 체크하지 말것
+		mg.mongoClient.DropIndex(CollectionBlock, "codeaccid")
 	}
 
 	if err = mg.mongoClient.MakeExpireIndex(CollectionBlock, int32(3)); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionPlatformLoginToken, map[string]bson.D{
 		"platformauthtoken": {{Key: "platform", Value: 1}, {Key: "key", Value: 1}},
 	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeExpireIndex(CollectionPlatformLoginToken, int32(mg.SessionTTL+300)); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionUserToken, map[string]bson.D{
 		"platformusertoken": {{Key: "platform", Value: 1}, {Key: "userid", Value: 1}},
 	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionGamepotUserInfo, map[string]bson.D{
 		"gamepotuserid": {{Key: "gamepotuserid", Value: 1}},
 	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionFirebaseUserInfo, map[string]bson.D{
 		"firebaseuserid": {{Key: "firebaseuserid", Value: 1}},
 	}); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	mg.auths = makeAuthCollection(mg.mongoClient, time.Duration(mg.SessionTTL*int64(time.Second)))
@@ -397,7 +396,7 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
 	if err = mg.mongoClient.FindAllAs(CollectionFile, nil, &preall, options.Find().SetProjection(bson.M{
 		"link": 1,
 	})); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 
 	for _, pre := range preall {
@@ -412,35 +411,33 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
 			"_id": pre.Id,
 		}, &fulldoc)
 		if err != nil {
-			return err
+			return makeErrorWithStack(err)
 		}
 		err = fulldoc.Save()
 		if err != nil {
-			return err
+			return makeErrorWithStack(err)
 		}
 	}
 
-	var whites []whitelistmember
+	var whites []*whitelistmember
 	if err := mg.mongoClient.AllAs(CollectionWhitelist, &whites, options.Find().SetReturnKey(false)); err != nil {
-		return err
+		return makeErrorWithStack(err)
 	}
 	mg.wl.init(whites)
 
+	var blocks []*blockinfo
+	if err := mg.mongoClient.AllAs(CollectionBlock, &blocks); err != nil {
+		return makeErrorWithStack(err)
+	}
+	mg.bl.init(blocks)
+
 	go watchAuthCollection(context, mg.auths, mg.mongoClient)
-	go mg.watchWhitelistCollection(context)
+	go mg.wl.watchCollection(context, CollectionWhitelist, mg.mongoClient)
+	go mg.bl.watchCollection(context, CollectionBlock, mg.mongoClient)
 
 	return nil
 }
 
-func whitelistKey(email string, platform string) string {
-	if strings.HasPrefix(email, "*@") {
-		// 도메인 전체 허용
-		return email[2:]
-	}
-
-	return email
-}
-
 func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMux, prefix string) error {
 	var allServices []*serviceDescription
 	if err := mg.mongoClient.AllAs(CollectionService, &allServices, options.Find().SetReturnKey(false)); err != nil {