Compare commits
75 Commits
7639c749dc
...
f9a146321c
| Author | SHA1 | Date | |
|---|---|---|---|
| e37a974d9c | |||
| 470591cb44 | |||
| 38114769b3 | |||
| b05473a1c6 | |||
| 0fff694e8a | |||
| d8713298c4 | |||
| 763b0fc4bd | |||
| d8e18d7ffc | |||
| 381f1edb80 | |||
| a8e448b8ca | |||
| 9b0e3a5d5b | |||
| 5757a81cb8 | |||
| c4b8e630dc | |||
| 43b0242652 | |||
| 893744a1ab | |||
| 192cc569b4 | |||
| 56e6608537 | |||
| 0053033e32 | |||
| d1ff6a56fc | |||
| 114461c51d | |||
| 117a3e5d90 | |||
| fafc463f2a | |||
| e2bec481f0 | |||
| 89e7d35b5a | |||
| fe662c5355 | |||
| 6767a37704 | |||
| 2ea035a43b | |||
| 2a1ad499ed | |||
| 5cc6ddc8f1 | |||
| 0e070221f8 | |||
| d2e06961b9 | |||
| 28092fcf17 | |||
| c43c10982c | |||
| 02c4f9e3d1 | |||
| 1db22730aa | |||
| 869fa48d74 | |||
| 7470f8e001 | |||
| fc70a9482c | |||
| 9ccd97564a | |||
| 4958cb0b93 | |||
| 9c14480be7 | |||
| daf3e3f027 | |||
| 2de82b9d2a | |||
| 00c2d6e205 | |||
| 87d922c558 | |||
| 0be7adefe3 | |||
| 3a9f81f1cb | |||
| a97b9f0983 | |||
| 9edea29983 | |||
| 8e908982a8 | |||
| 6b68d918ba | |||
| 3216e2620a | |||
| f66904d428 | |||
| 8d70777269 | |||
| 15ead6b0bc | |||
| 97636ce31d | |||
| 2b4becdb61 | |||
| 429bbd1e7a | |||
| 1c397da77a | |||
| 5502c4d744 | |||
| cb793092e9 | |||
| 13f6492e5f | |||
| f739eb3a8b | |||
| c95d7747cd | |||
| 841dad4992 | |||
| ff7d56152e | |||
| 2acca6dbe8 | |||
| 484db90037 | |||
| b06eb86578 | |||
| 9704decb7a | |||
| 767d6bf002 | |||
| 1f7421dd2e | |||
| 53701d61f8 | |||
| 6d02eb092c | |||
| 7bee78a875 |
@ -1,9 +1,7 @@
|
||||
{
|
||||
"maingate_mongodb_url": "mongodb://...",
|
||||
"session_storage": "",
|
||||
"session_ttl" : 3600,
|
||||
|
||||
"autologin_ttl": 604800,
|
||||
"acc_del_ttl": 7776000,
|
||||
"maximum_num_link_account": 10,
|
||||
"redirect_base_url": "",
|
||||
"google_client_id" : "",
|
||||
|
||||
42
core/api.go
42
core/api.go
@ -199,8 +199,6 @@ func (caller apiCaller) blockAPI(w http.ResponseWriter, r *http.Request) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
mg.sessionProvider.Delete(accid)
|
||||
} else if r.Method == "DELETE" {
|
||||
id := r.URL.Query().Get("id")
|
||||
|
||||
@ -223,6 +221,8 @@ func (caller apiCaller) blockAPI(w http.ResponseWriter, r *http.Request) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
mg.mongoClient.Delete(CollectionAuth, bson.M{"_id": idobj})
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -239,7 +239,7 @@ func (caller apiCaller) whitelistAPI(w http.ResponseWriter, r *http.Request) err
|
||||
return err
|
||||
}
|
||||
member.ExpiredAt = 0
|
||||
|
||||
member.Id = primitive.NilObjectID
|
||||
_, _, err := mg.mongoClient.Update(CollectionWhitelist, bson.M{
|
||||
"_id": primitive.NewObjectID(),
|
||||
}, bson.M{
|
||||
@ -403,6 +403,40 @@ func (caller apiCaller) configAPI(w http.ResponseWriter, r *http.Request) error
|
||||
return nil
|
||||
}
|
||||
|
||||
func (caller apiCaller) lockcreatecharAPI(w http.ResponseWriter, r *http.Request) error {
|
||||
mg, err := caller.mg.mongoClient.FindAll(CollectionService, bson.M{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
haschr, _ := gocommon.ReadStringFormValue(r.Form, "haschr")
|
||||
|
||||
locked := make(map[string]any)
|
||||
if haschr == "true" {
|
||||
locked["lock"] = false
|
||||
} else {
|
||||
curregion, _ := gocommon.ReadStringFormValue(r.Form, "region")
|
||||
|
||||
for _, regioninfo := range mg {
|
||||
region := regioninfo["divisions"].(primitive.M)
|
||||
for idx, rl := range region {
|
||||
if idx == curregion {
|
||||
if rl.(primitive.M)["lockcreatechar"].(bool) {
|
||||
locked["lock"] = true
|
||||
} else {
|
||||
locked["lock"] = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
create, _ := json.Marshal(locked)
|
||||
w.Write(create)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type apiCaller struct {
|
||||
userinfo map[string]any
|
||||
globalAdmins map[string]bool
|
||||
@ -509,6 +543,8 @@ func (mg *Maingate) api(w http.ResponseWriter, r *http.Request) {
|
||||
err = caller.blockAPI(w, r)
|
||||
} else if strings.HasSuffix(r.URL.Path, "/coupon") {
|
||||
err = caller.couponAPI(w, r)
|
||||
} else if strings.HasSuffix(r.URL.Path, "/lockcreatechar") {
|
||||
err = caller.lockcreatecharAPI(w, r)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
|
||||
@ -44,17 +44,17 @@ func makeCouponKey(roundnum uint32, uid []byte) string {
|
||||
return fmt.Sprintf("%s-%s-%s-%s", hex.EncodeToString(final[0:2]), hex.EncodeToString(final[2:4]), hex.EncodeToString(final[4:6]), hex.EncodeToString(final[6:8]))
|
||||
}
|
||||
|
||||
var r = rand.New(rand.NewSource(time.Now().UnixNano()))
|
||||
|
||||
func makeCouponCodes(name string, count int) (string, map[string]string) {
|
||||
checkunique := make(map[string]bool)
|
||||
keys := make(map[string]string)
|
||||
uid := make([]byte, 4)
|
||||
|
||||
roundHash, roundnum := coupon.MakeCouponRoundHash(name)
|
||||
seed := time.Now().UnixNano()
|
||||
|
||||
for len(keys) < count {
|
||||
r.Read(uid)
|
||||
rand.Seed(seed)
|
||||
rand.Read(uid)
|
||||
|
||||
code := makeCouponKey(roundnum, uid)
|
||||
|
||||
@ -62,6 +62,7 @@ func makeCouponCodes(name string, count int) (string, map[string]string) {
|
||||
checkunique[code] = true
|
||||
keys[hex.EncodeToString(uid)] = code
|
||||
}
|
||||
seed = int64(binary.BigEndian.Uint32(uid))
|
||||
}
|
||||
return roundHash, keys
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ func TestMakeLocalUniqueId(t *testing.T) {
|
||||
fmt.Println(start.Time().Format(time.RFC3339))
|
||||
fmt.Println(end.Time().Format(time.RFC3339))
|
||||
|
||||
mongoClient, err := gocommon.NewMongoClient(context.Background(), "mongodb://121.134.91.160:27018/?replicaSet=rs0&retrywrites=true")
|
||||
mongoClient, err := gocommon.NewMongoClient(context.Background(), "mongodb://121.134.91.160:27018/mountain-maingate?replicaSet=rs0&retrywrites=true", "maingate")
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
213
core/maingate.go
213
core/maingate.go
@ -9,9 +9,11 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"math/big"
|
||||
"math/rand"
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
"runtime/debug"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"text/template"
|
||||
@ -21,7 +23,6 @@ import (
|
||||
"repositories.action2quare.com/ayo/gocommon"
|
||||
"repositories.action2quare.com/ayo/gocommon/flagx"
|
||||
"repositories.action2quare.com/ayo/gocommon/logger"
|
||||
"repositories.action2quare.com/ayo/gocommon/session"
|
||||
|
||||
"github.com/golang-jwt/jwt"
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
@ -39,6 +40,7 @@ var noauth = flagx.Bool("noauth", false, "")
|
||||
|
||||
var (
|
||||
CollectionLink = gocommon.CollectionName("link")
|
||||
CollectionAuth = gocommon.CollectionName("auth")
|
||||
CollectionWhitelist = gocommon.CollectionName("whitelist")
|
||||
CollectionService = gocommon.CollectionName("service")
|
||||
CollectionAccount = gocommon.CollectionName("account")
|
||||
@ -72,10 +74,57 @@ func SessionTTL() time.Duration {
|
||||
return sessionTTL
|
||||
}
|
||||
|
||||
type mongoAuthCell struct {
|
||||
src *gocommon.Authinfo
|
||||
}
|
||||
|
||||
func (ac *mongoAuthCell) ToAuthinfo() *gocommon.Authinfo {
|
||||
if ac.src == nil {
|
||||
logger.Error("mongoAuthCell ToAuthinfo failed. ac.src is nil")
|
||||
}
|
||||
return ac.src
|
||||
}
|
||||
|
||||
func (ac *mongoAuthCell) ToBytes() []byte {
|
||||
bt, _ := json.Marshal(ac.src)
|
||||
return bt
|
||||
}
|
||||
|
||||
func makeAuthCollection(mongoClient gocommon.MongoClient, sessionTTL time.Duration) *gocommon.AuthCollection {
|
||||
authcoll := gocommon.MakeAuthCollection(sessionTTL)
|
||||
authcoll.SessionRemoved = func(sk string) {
|
||||
skid, _ := primitive.ObjectIDFromHex(sk)
|
||||
mongoClient.Delete(CollectionAuth, bson.M{
|
||||
"sk": skid,
|
||||
})
|
||||
}
|
||||
authcoll.QuerySession = func(sk string, token string) gocommon.AuthinfoCell {
|
||||
skid, _ := primitive.ObjectIDFromHex(sk)
|
||||
var outcell mongoAuthCell
|
||||
err := mongoClient.FindOneAs(CollectionAuth, bson.M{
|
||||
"sk": skid,
|
||||
}, &outcell.src, options.FindOne().SetHint("skonly"))
|
||||
|
||||
if err != nil {
|
||||
logger.Error("QuerySession failed :", err)
|
||||
return nil
|
||||
}
|
||||
|
||||
if outcell.src == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &outcell
|
||||
}
|
||||
|
||||
return authcoll
|
||||
}
|
||||
|
||||
type maingateConfig struct {
|
||||
session.SessionConfig `json:",inline"`
|
||||
Mongo string `json:"maingate_mongodb_url"`
|
||||
SessionTTL int64 `json:"maingate_session_ttl"`
|
||||
Autologin_ttl int64 `json:"autologin_ttl"`
|
||||
AccDelTTL int64 `json:"acc_del_ttl"`
|
||||
MaximumNumLinkAccount int64 `json:"maximum_num_link_account"`
|
||||
RedirectBaseUrl string `json:"redirect_base_url"`
|
||||
GoogleClientId string `json:"google_client_id"`
|
||||
@ -131,7 +180,7 @@ type Maingate struct {
|
||||
|
||||
mongoClient gocommon.MongoClient
|
||||
|
||||
sessionProvider session.Provider
|
||||
auths *gocommon.AuthCollection
|
||||
//services servicelist
|
||||
serviceptr unsafe.Pointer
|
||||
admins unsafe.Pointer
|
||||
@ -158,10 +207,6 @@ func New(ctx context.Context) (*Maingate, error) {
|
||||
admins.parse()
|
||||
}
|
||||
|
||||
if len(config.SessionStorage) == 0 {
|
||||
return nil, errors.New("maingate_session_storage is missing")
|
||||
}
|
||||
|
||||
if config.SessionTTL == 0 {
|
||||
config.SessionTTL = 3600
|
||||
}
|
||||
@ -256,96 +301,110 @@ 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 logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
if err := mg.discoverOpenIdConfiguration("google", "https://accounts.google.com/.well-known/openid-configuration"); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
// redis에서 env를 가져온 후에
|
||||
mg.mongoClient, err = gocommon.NewMongoClient(context, mg.Mongo)
|
||||
mg.mongoClient, err = gocommon.NewMongoClient(context, mg.Mongo, "maingate")
|
||||
if err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
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 logger.ErrorWithCallStack(err)
|
||||
return err
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeUniqueIndices(CollectionAuth, map[string]bson.D{
|
||||
"skonly": {{Key: "sk", Value: 1}},
|
||||
}); err != nil {
|
||||
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 logger.ErrorWithCallStack(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 logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeIndices(CollectionAccount, map[string]bson.D{
|
||||
"accid": {{Key: "accid", Value: 1}},
|
||||
}); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeUniqueIndices(CollectionFile, map[string]bson.D{
|
||||
"keyonly": {{Key: "key", Value: 1}},
|
||||
}); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeExpireIndex(CollectionAccount, int32(mg.AccDelTTL)); err != nil {
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeExpireIndex(CollectionLink, int32(mg.AccDelTTL)); err != nil {
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
// Delete대신 _ts로 expire시킴. pipeline에 삭제 알려주기 위함
|
||||
if err = mg.mongoClient.MakeExpireIndex(CollectionWhitelist, 10); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if *devflag {
|
||||
// 에러 체크하지 말것
|
||||
mg.mongoClient.DropIndex(CollectionBlock, "codeaccid")
|
||||
if err = mg.mongoClient.MakeExpireIndex(CollectionAuth, int32(mg.SessionTTL+300)); err != nil {
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeExpireIndex(CollectionBlock, int32(3)); err != nil {
|
||||
return logger.ErrorWithCallStack(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 logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeExpireIndex(CollectionPlatformLoginToken, int32(mg.SessionTTL+300)); err != nil {
|
||||
return logger.ErrorWithCallStack(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 logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeUniqueIndices(CollectionGamepotUserInfo, map[string]bson.D{
|
||||
"gamepotuserid": {{Key: "gamepotuserid", Value: 1}},
|
||||
}); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
if err = mg.mongoClient.MakeUniqueIndices(CollectionFirebaseUserInfo, map[string]bson.D{
|
||||
"firebaseuserid": {{Key: "firebaseuserid", Value: 1}},
|
||||
}); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
mg.sessionProvider, err = session.NewProviderWithConfig(context, mg.SessionConfig)
|
||||
if err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
}
|
||||
mg.auths = makeAuthCollection(mg.mongoClient, time.Duration(mg.SessionTTL*int64(time.Second)))
|
||||
|
||||
var preall []struct {
|
||||
Link string `bson:"link"`
|
||||
@ -354,7 +413,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 logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
|
||||
for _, pre := range preall {
|
||||
@ -369,26 +428,27 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
|
||||
"_id": pre.Id,
|
||||
}, &fulldoc)
|
||||
if err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
err = fulldoc.Save()
|
||||
if err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
}
|
||||
|
||||
var whites []*whitelistmember
|
||||
if err := mg.mongoClient.AllAs(CollectionWhitelist, &whites, options.Find().SetReturnKey(false)); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
mg.wl.init(whites)
|
||||
|
||||
var blocks []*blockinfo
|
||||
if err := mg.mongoClient.AllAs(CollectionBlock, &blocks); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return makeErrorWithStack(err)
|
||||
}
|
||||
mg.bl.init(blocks)
|
||||
|
||||
go watchAuthCollection(context, mg.auths, mg.mongoClient)
|
||||
go mg.wl.watchCollection(context, CollectionWhitelist, mg.mongoClient)
|
||||
go mg.bl.watchCollection(context, CollectionBlock, mg.mongoClient)
|
||||
|
||||
@ -398,7 +458,7 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
|
||||
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 {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return err
|
||||
}
|
||||
|
||||
if len(allServices) > 0 {
|
||||
@ -417,7 +477,7 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
|
||||
host, _ := os.Hostname()
|
||||
addrs, err := net.InterfaceAddrs()
|
||||
if err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return err
|
||||
}
|
||||
ipaddr := "127.0.0.1"
|
||||
for _, addr := range addrs {
|
||||
@ -431,8 +491,9 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
|
||||
empty.Divisions = map[string]*Division{
|
||||
host: {
|
||||
DivisionForUser: DivisionForUser{
|
||||
Priority: 0,
|
||||
State: DivisionState_FullOpen,
|
||||
Priority: 0,
|
||||
State: DivisionState_FullOpen,
|
||||
LockCreateChar: false,
|
||||
},
|
||||
|
||||
Url: fmt.Sprintf("http://%s/warehouse", ipaddr),
|
||||
@ -449,7 +510,7 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
|
||||
}, options.Update().SetUpsert(true))
|
||||
|
||||
if err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
@ -458,11 +519,12 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
|
||||
mg.service().serveHTTP(w, r)
|
||||
})
|
||||
serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, "api/"), mg.api)
|
||||
serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, "query/"), mg.query)
|
||||
|
||||
configraw, _ := json.Marshal(mg.maingateConfig)
|
||||
var convertedConfig map[string]any
|
||||
if err := json.Unmarshal(configraw, &convertedConfig); err != nil {
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return err
|
||||
}
|
||||
|
||||
serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, "config"), func(w http.ResponseWriter, r *http.Request) {
|
||||
@ -495,7 +557,7 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
|
||||
|
||||
if err := os.MkdirAll("static", os.ModePerm); err != nil {
|
||||
// 일반 엔드유저한테 오픈할 static 페이지
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return err
|
||||
}
|
||||
|
||||
cfsx := http.FileServer(http.Dir("console"))
|
||||
@ -546,11 +608,59 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mg *Maingate) query(w http.ResponseWriter, r *http.Request) {
|
||||
defer func() {
|
||||
s := recover()
|
||||
if s != nil {
|
||||
logger.Error(s)
|
||||
}
|
||||
}()
|
||||
|
||||
defer func() {
|
||||
io.Copy(io.Discard, r.Body)
|
||||
r.Body.Close()
|
||||
}()
|
||||
|
||||
queryvals := r.URL.Query()
|
||||
sk := queryvals.Get("sk")
|
||||
|
||||
if len(sk) == 0 {
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
info := mg.auths.Find(sk)
|
||||
if info == nil {
|
||||
logger.Println("session key is not valid :", sk)
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
if !*devflag {
|
||||
apitoken := r.Header.Get("MG-X-API-TOKEN")
|
||||
if len(apitoken) == 0 {
|
||||
logger.Println("MG-X-API-TOKEN is missing")
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
apitokenObj, _ := primitive.ObjectIDFromHex(apitoken)
|
||||
if !mg.service().isValidToken(apitokenObj) {
|
||||
logger.Println("MG-X-API-TOKEN is invalid :", apitoken)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
bt, _ := json.Marshal(info)
|
||||
w.Write(bt)
|
||||
}
|
||||
|
||||
func (mg *Maingate) GeneratePlatformLoginNonceKey() string {
|
||||
const allowed = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
|
||||
b := make([]byte, 52)
|
||||
for i := range b {
|
||||
b[i] = allowed[r.Intn(len(allowed))]
|
||||
b[i] = allowed[rand.Intn(len(allowed))]
|
||||
}
|
||||
return string(b)
|
||||
}
|
||||
@ -564,7 +674,7 @@ func (mg *Maingate) GetUserBrowserInfo(r *http.Request) (string, error) {
|
||||
|
||||
cookie, err := r.Cookie("ActionSquareSessionExtraInfo")
|
||||
if err != nil {
|
||||
return "", logger.ErrorWithCallStack(err)
|
||||
return "", err
|
||||
}
|
||||
|
||||
//requestinfo := fmt.Sprintf("%s_%s", cookie.Value, host) //-- RemoteAddr체크는 로드밸런서 IP 찍히는 문제 때문에 제외한다.
|
||||
@ -586,7 +696,7 @@ func (mg *Maingate) setUserToken(info usertokeninfo) error {
|
||||
"accesstoken_expire_time": info.accesstoken_expire_time,
|
||||
},
|
||||
}, options.Update().SetUpsert(true))
|
||||
return logger.ErrorWithCallStack(err)
|
||||
return err
|
||||
}
|
||||
|
||||
func (mg *Maingate) getUserTokenWithCheck(platform string, userid string, brinfo string) (usertokeninfo, error) {
|
||||
@ -700,13 +810,18 @@ func (mg *Maingate) getProviderInfo(platform string, uid string) (string, string
|
||||
if provider == "" || providerid == "" {
|
||||
return "", "", errors.New("getProviderInfo - firebase info not found: " + provider + " / " + providerid)
|
||||
}
|
||||
case "":
|
||||
//guest auth
|
||||
providerid = uid
|
||||
if providerid == "" {
|
||||
return "", "", errors.New("getProviderInfo - guest provider id not found: " + provider + " / " + providerid)
|
||||
}
|
||||
default:
|
||||
provider = platform
|
||||
providerid = uid
|
||||
}
|
||||
|
||||
if provider == "" || providerid == "" {
|
||||
return "", "", errors.New("getProviderInfo - provider info not found: " + provider + " / " + providerid)
|
||||
if provider == "" || providerid == "" {
|
||||
return "", "", errors.New("getProviderInfo - provider info not found: " + provider + " / " + providerid)
|
||||
}
|
||||
}
|
||||
|
||||
return provider, providerid, nil
|
||||
|
||||
@ -95,7 +95,7 @@ func (p *memberContainerPtr[K, T]) contains(key K, out *T) bool {
|
||||
return false
|
||||
}
|
||||
if out != nil {
|
||||
out = &found
|
||||
*out = found
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
565
core/service.go
565
core/service.go
@ -1,7 +1,6 @@
|
||||
package core
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
@ -14,7 +13,6 @@ import (
|
||||
|
||||
"repositories.action2quare.com/ayo/gocommon"
|
||||
"repositories.action2quare.com/ayo/gocommon/logger"
|
||||
"repositories.action2quare.com/ayo/gocommon/session"
|
||||
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
@ -36,7 +34,7 @@ type blockinfoWithStringId struct {
|
||||
}
|
||||
|
||||
type whitelistmember struct {
|
||||
Id primitive.ObjectID `bson:"_id" json:"_id"`
|
||||
Id primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
|
||||
Email string `bson:"email" json:"email"`
|
||||
Platform string `bson:"platform" json:"platform"`
|
||||
Desc string `bson:"desc" json:"desc"`
|
||||
@ -90,9 +88,10 @@ type Maintenance struct {
|
||||
}
|
||||
|
||||
type DivisionForUser struct {
|
||||
Priority int `bson:"priority" json:"priority"`
|
||||
State DivisionStateName `bson:"state" json:"state"`
|
||||
Maintenance *Maintenance `bson:"maintenance,omitempty" json:"maintenance,omitempty"`
|
||||
Priority int `bson:"priority" json:"priority"`
|
||||
State DivisionStateName `bson:"state" json:"state"`
|
||||
LockCreateChar bool `bson:"lockcreatechar" json:"lockcreatechar"`
|
||||
Maintenance *Maintenance `bson:"maintenance,omitempty" json:"maintenance,omitempty"`
|
||||
}
|
||||
|
||||
type Division struct {
|
||||
@ -112,11 +111,11 @@ type serviceDescription struct {
|
||||
MaximumNumLinkAccount int64
|
||||
VersionSplits map[string]string `bson:"version_splits" json:"version_splits"`
|
||||
|
||||
sessionProvider session.Provider
|
||||
wl *memberContainerPtr[string, *whitelistmember]
|
||||
bl *memberContainerPtr[primitive.ObjectID, *blockinfo]
|
||||
mongoClient gocommon.MongoClient
|
||||
sessionTTL time.Duration
|
||||
auths *gocommon.AuthCollection
|
||||
wl *memberContainerPtr[string, *whitelistmember]
|
||||
bl *memberContainerPtr[primitive.ObjectID, *blockinfo]
|
||||
mongoClient gocommon.MongoClient
|
||||
sessionTTL time.Duration
|
||||
|
||||
serviceCodeBytes []byte
|
||||
getUserBrowserInfo func(r *http.Request) (string, error)
|
||||
@ -163,7 +162,6 @@ func (sh *serviceDescription) readProfile(authtype string, id string, binfo stri
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
if len(userinfo.token) == 0 {
|
||||
return "", errors.New("refreshtoken token not found")
|
||||
}
|
||||
@ -255,7 +253,7 @@ func (sh *serviceDescription) prepare(mg *Maingate) error {
|
||||
|
||||
sh.MaximumNumLinkAccount = mg.maingateConfig.MaximumNumLinkAccount
|
||||
sh.mongoClient = mg.mongoClient
|
||||
sh.sessionProvider = mg.sessionProvider
|
||||
sh.auths = mg.auths
|
||||
sh.sessionTTL = time.Duration(mg.SessionTTL * int64(time.Second))
|
||||
sh.serviceCodeBytes, _ = hex.DecodeString(sh.ServiceCode)
|
||||
sh.getUserBrowserInfo = mg.GetUserBrowserInfo
|
||||
@ -294,10 +292,11 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
|
||||
newType := queryvals.Get("ntype")
|
||||
newId := queryvals.Get("nid")
|
||||
|
||||
oldAuth, err := sh.sessionProvider.Query(sk)
|
||||
if err != nil {
|
||||
logger.Println("sessionProvider.Query return err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
oldAuth := sh.auths.Find(sk)
|
||||
if oldAuth == nil {
|
||||
// 잘못된 세션
|
||||
logger.Println("link failed. session key is not valid :", sk)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
@ -312,13 +311,6 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
|
||||
// fmt.Println(oldAuth.Uid)
|
||||
// fmt.Println("=================")
|
||||
|
||||
//if oldAuth.Token != oldToken || oldAuth.Uid != oldId || oldAuth.Platform != oldType {
|
||||
if oldAuth.Uid != oldId || oldAuth.Platform != oldType {
|
||||
logger.Println("link failed. session key is not correct :", oldAuth, queryvals)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
bfinfo, err := sh.getUserBrowserInfo(r)
|
||||
if err != nil {
|
||||
logger.Error("getUserBrowserInfo failed :", err)
|
||||
@ -326,16 +318,35 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
_, err = sh.readProfile(oldType, oldId, bfinfo)
|
||||
guestlink := (len(oldType) == 0)
|
||||
if !guestlink {
|
||||
_, err = sh.readProfile(oldType, oldId, bfinfo)
|
||||
if err != nil {
|
||||
logger.Println("readProfile(old) failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
logger.Println("from guest acc to real acc link : ", oldId, bfinfo, newType, newId, bfinfo)
|
||||
}
|
||||
|
||||
oldType, oldId, err = sh.getProviderInfo(oldType, oldId)
|
||||
if err != nil {
|
||||
logger.Error("readProfile(old) failed :", err)
|
||||
logger.Println("getProviderInfo failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
//if oldAuth.Token != oldToken || oldAuth.Uid != oldId || oldAuth.Platform != oldType {
|
||||
if oldAuth.Uid != oldId || oldAuth.Platform != oldType {
|
||||
logger.Println("link failed. session key is not correct :", *oldAuth, queryvals)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
email, err := sh.readProfile(newType, newId, bfinfo)
|
||||
if err != nil {
|
||||
logger.Error("readProfile(new) failed :", err)
|
||||
logger.Println("readProfile(new) failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
@ -348,8 +359,9 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
newType, newId, err = sh.getProviderInfo(newType, newId)
|
||||
if err != nil {
|
||||
logger.Error("getProviderInfo failed :", err)
|
||||
logger.Println("getProviderInfo failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
createtime := primitive.NewDateTimeFromTime(time.Now().UTC())
|
||||
@ -372,13 +384,13 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
|
||||
"_id": link["_id"].(primitive.ObjectID),
|
||||
}, bson.M{
|
||||
"$setOnInsert": bson.M{
|
||||
"accid": oldAuth.Account,
|
||||
"accid": oldAuth.Accid,
|
||||
"create": createtime,
|
||||
},
|
||||
}, options.Update().SetUpsert(true))
|
||||
if err != nil {
|
||||
logger.Error("link failed. Update ServiceName err :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
@ -390,6 +402,20 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if guestlink {
|
||||
//기존 게스트 링크 삭제
|
||||
link, err = sh.mongoClient.FindOneAndDelete(CollectionLink, bson.M{
|
||||
"platform": oldType,
|
||||
"uid": oldId,
|
||||
}, options.FindOneAndDelete().SetProjection(bson.M{"_id": 1}))
|
||||
|
||||
if err == nil {
|
||||
sh.mongoClient.Delete(CollectionAccount, bson.M{
|
||||
"_id": link["_id"].(primitive.ObjectID),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
logger.Println("link success :", r.URL.Query())
|
||||
}
|
||||
|
||||
@ -411,11 +437,13 @@ func (sh *serviceDescription) unlink(w http.ResponseWriter, r *http.Request) {
|
||||
sType := queryvals.Get("stype")
|
||||
sId := queryvals.Get("sid")
|
||||
sk := queryvals.Get("sk")
|
||||
targetType := queryvals.Get("ttype")
|
||||
|
||||
authInfo, err := sh.sessionProvider.Query(sk)
|
||||
if err != nil {
|
||||
logger.Println("sessionProvider.Query return err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
authInfo := sh.auths.Find(sk)
|
||||
if authInfo == nil {
|
||||
// 잘못된 세션
|
||||
logger.Println("linkinfo failed. session key is not valid :", sk)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
@ -427,55 +455,60 @@ func (sh *serviceDescription) unlink(w http.ResponseWriter, r *http.Request) {
|
||||
// fmt.Println(authInfo.Uid)
|
||||
// fmt.Println("=================")
|
||||
|
||||
if authInfo.Uid != sId || authInfo.Platform != sType {
|
||||
logger.Println("unlink failed. session key is not correct :", authInfo, queryvals)
|
||||
sType, sId, err := sh.getProviderInfo(sType, sId)
|
||||
if err != nil {
|
||||
logger.Println("getProviderInfo failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
numRecord, err := sh.mongoClient.Collection(CollectionAccount).CountDocuments(context.Background(), bson.M{
|
||||
"accid": authInfo.Account,
|
||||
}, options.Count().SetLimit(2))
|
||||
if authInfo.Uid != sId || authInfo.Platform != sType {
|
||||
logger.Println("unlink failed. session key is not correct :", *authInfo, queryvals)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
accDocs, err := sh.mongoClient.FindAll(CollectionAccount, bson.M{
|
||||
"accid": authInfo.Accid,
|
||||
}, options.Find().SetProjection(bson.M{
|
||||
"_id": 1,
|
||||
}))
|
||||
|
||||
if err != nil {
|
||||
logger.Error("unlink failed, fail to count accounts :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
if numRecord <= 1 {
|
||||
if len(accDocs) <= 1 {
|
||||
logger.Println("unlink failed. At least one link must be maintained. :", r.URL.Query())
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
sType, sId, err = sh.getProviderInfo(sType, sId)
|
||||
if err != nil {
|
||||
logger.Error("getProviderInfo failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
var ids primitive.A
|
||||
for _, accDoc := range accDocs {
|
||||
ids = append(ids, accDoc["_id"].(primitive.ObjectID))
|
||||
}
|
||||
|
||||
link, err := sh.mongoClient.FindOne(CollectionLink, bson.M{
|
||||
"platform": sType,
|
||||
"uid": sId,
|
||||
}, options.FindOne().SetProjection(bson.M{"_id": 1}))
|
||||
link, err := sh.mongoClient.FindOneAndDelete(CollectionLink, bson.M{
|
||||
"platform": targetType,
|
||||
"_id": bson.M{"$in": ids},
|
||||
}, options.FindOneAndDelete().SetProjection(bson.M{"_id": 1}))
|
||||
if err != nil {
|
||||
logger.Error("link failed. FindOneAndUpdate link err:", err)
|
||||
logger.Error("unlink failed. FindOneAndDelete link err:", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
newid, err := sh.mongoClient.FindOneAndDelete(CollectionAccount, bson.M{
|
||||
preid, err := sh.mongoClient.FindOneAndDelete(CollectionAccount, bson.M{
|
||||
"_id": link["_id"].(primitive.ObjectID),
|
||||
}, options.FindOneAndDelete().SetProjection(bson.M{"_id": 1}))
|
||||
if err != nil {
|
||||
logger.Error("unlink failed. Delete ServiceName err :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// newid가 있어야 한다. 그래야 기존 서비스 계정이 없는 상태이다.
|
||||
if newid == nil {
|
||||
// 이미 계정이 있네?
|
||||
if preid == nil {
|
||||
logger.Println("unlink failed. service account not found:", r.URL.Query())
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
@ -503,10 +536,11 @@ func (sh *serviceDescription) linkinfo(w http.ResponseWriter, r *http.Request) {
|
||||
sId := queryvals.Get("sid")
|
||||
sk := queryvals.Get("sk")
|
||||
|
||||
authInfo, err := sh.sessionProvider.Query(sk)
|
||||
if err != nil {
|
||||
logger.Println("sessionProvider.Query return err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
authInfo := sh.auths.Find(sk)
|
||||
if authInfo == nil {
|
||||
// 잘못된 세션
|
||||
logger.Println("linkinfo failed. session key is not valid :", sk)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
@ -518,26 +552,62 @@ func (sh *serviceDescription) linkinfo(w http.ResponseWriter, r *http.Request) {
|
||||
// fmt.Println(authInfo.Uid)
|
||||
// fmt.Println("=================")
|
||||
|
||||
sType, sId, err := sh.getProviderInfo(sType, sId)
|
||||
if err != nil {
|
||||
logger.Println("getProviderInfo failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
//if oldAuth.Token != oldToken || oldAuth.Uid != oldId || oldAuth.Platform != oldType {
|
||||
if authInfo.Uid != sId || authInfo.Platform != sType {
|
||||
logger.Println("linkinfo failed. session key is not correct :", authInfo, queryvals)
|
||||
logger.Println("linkinfo failed. session key is not correct :", *authInfo, queryvals)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
numRecord, err := sh.mongoClient.Collection(CollectionAccount).CountDocuments(context.Background(), bson.M{
|
||||
"accid": authInfo.Account,
|
||||
}, options.Count().SetLimit(sh.MaximumNumLinkAccount))
|
||||
|
||||
platformName := "platform"
|
||||
accDocs, err := sh.mongoClient.FindAll(CollectionAccount, bson.M{
|
||||
"accid": authInfo.Accid,
|
||||
}, options.Find().SetLimit(sh.MaximumNumLinkAccount).SetProjection(bson.M{
|
||||
"_id": 1,
|
||||
}))
|
||||
if err != nil {
|
||||
logger.Error("linkinfo failed. CountDocuments err :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
logger.Println("linkinfo :", numRecord)
|
||||
w.Write([]byte(fmt.Sprintf(`{"num_linked_account":"%d"}`, numRecord)))
|
||||
var ids primitive.A
|
||||
for _, accDoc := range accDocs {
|
||||
ids = append(ids, accDoc["_id"].(primitive.ObjectID))
|
||||
}
|
||||
|
||||
links, err := sh.mongoClient.FindAll(CollectionLink, bson.M{
|
||||
"_id": bson.M{"$in": ids},
|
||||
}, options.Find().SetLimit(sh.MaximumNumLinkAccount).SetProjection(bson.M{
|
||||
platformName: 1,
|
||||
}))
|
||||
if err != nil {
|
||||
logger.Error("linkinfo failed. FindAll returns err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
var linkstrs []string
|
||||
for _, link := range links {
|
||||
linkstrs = append(linkstrs, link[platformName].(string))
|
||||
}
|
||||
|
||||
linkbytes, err := json.Marshal(linkstrs)
|
||||
if err != nil {
|
||||
logger.Error("linkinfo failed. json marshal fail :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
logger.Println("linkinfo :", linkstrs)
|
||||
w.Write(linkbytes)
|
||||
}
|
||||
|
||||
func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request) {
|
||||
@ -556,26 +626,8 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
|
||||
queryvals := r.URL.Query()
|
||||
authtype := queryvals.Get("type")
|
||||
uid := queryvals.Get("id")
|
||||
if sk := queryvals.Get("sk"); len(sk) > 0 {
|
||||
success, err := sh.sessionProvider.Touch(sk)
|
||||
if err != nil {
|
||||
logger.Error("authorize failed. sessionProvider.Touch err:", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// !success일 때 빈 body를 보내면 클라이언트는 로그아웃 된다.
|
||||
if success {
|
||||
json.NewEncoder(w).Encode(map[string]any{
|
||||
"sk": sk,
|
||||
"expirein": sh.sessionTTL.Seconds(),
|
||||
})
|
||||
} else {
|
||||
logger.Println("sh.sessionProvider.Touch failed :", sk)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
//accesstoken := queryvals.Get("token") //-- 이거 이제 받지마라
|
||||
session := queryvals.Get("sk")
|
||||
var email string
|
||||
|
||||
if !*noauth {
|
||||
@ -583,114 +635,173 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
|
||||
//email, err := sh.readProfile(authtype, uid, accesstoken)
|
||||
bfinfo, err := sh.getUserBrowserInfo(r)
|
||||
if err != nil {
|
||||
logger.Error("getUserBrowserInfo failed :", err)
|
||||
logger.Println("getUserBrowserInfo failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
email, err = sh.readProfile(authtype, uid, bfinfo)
|
||||
if err != nil {
|
||||
logger.Error("readProfile failed :", err)
|
||||
logger.Println("readProfile failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
newType, newId, err := sh.getProviderInfo(authtype, uid)
|
||||
if err != nil {
|
||||
logger.Error("getProviderInfo failed :", err)
|
||||
logger.Println("getProviderInfo failed :", err)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if authtype != newType || uid != newId {
|
||||
logger.Printf("auth success ( redirect ) : %s->%s, %s->%s, %s, %s", authtype, newType, uid, newId, email, session)
|
||||
authtype = newType
|
||||
uid = newId
|
||||
}
|
||||
} else if *devflag {
|
||||
email = fmt.Sprintf("%s@guest.flag", uid)
|
||||
} else {
|
||||
// authtype이 없으면 입장 불가
|
||||
logger.Error("authorize failed. 'type' query parameter is missing")
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
email = fmt.Sprintf("%s@guest.flag", uid)
|
||||
}
|
||||
} else {
|
||||
email = fmt.Sprintf("%s@noauth.flag", uid)
|
||||
}
|
||||
|
||||
// platform + id -> account id
|
||||
createtime := primitive.NewDateTimeFromTime(time.Now().UTC())
|
||||
link, err := sh.mongoClient.FindOneAndUpdate(CollectionLink, bson.M{
|
||||
"platform": authtype,
|
||||
"uid": uid,
|
||||
}, bson.M{
|
||||
"$setOnInsert": bson.M{
|
||||
"create": createtime,
|
||||
"email": email,
|
||||
},
|
||||
}, options.FindOneAndUpdate().SetReturnDocument(options.After).SetUpsert(true).SetProjection(bson.M{"_id": 1}))
|
||||
if err != nil {
|
||||
logger.Error("authorize failed :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
//if len(session) == 0 && len(email) > 0 {
|
||||
if len(session) == 0 {
|
||||
// platform + id -> account id
|
||||
createtime := primitive.NewDateTimeFromTime(time.Now().UTC())
|
||||
link, err := sh.mongoClient.FindOneAndUpdate(CollectionLink, bson.M{
|
||||
"platform": authtype,
|
||||
"uid": uid,
|
||||
}, bson.M{
|
||||
"$setOnInsert": bson.M{
|
||||
"create": createtime,
|
||||
"email": email,
|
||||
},
|
||||
}, options.FindOneAndUpdate().SetReturnDocument(options.After).SetUpsert(true).SetProjection(bson.M{
|
||||
"_id": 1,
|
||||
"_ts": 1,
|
||||
}))
|
||||
if err != nil {
|
||||
logger.Error("authorize failed :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
linkid := link["_id"].(primitive.ObjectID)
|
||||
newaccid := primitive.NewObjectID()
|
||||
for i := 0; i < len(sh.serviceCodeBytes); i++ {
|
||||
newaccid[i] ^= sh.serviceCodeBytes[i]
|
||||
}
|
||||
account, err := sh.mongoClient.FindOneAndUpdate(CollectionAccount, bson.M{
|
||||
"_id": linkid,
|
||||
}, bson.M{
|
||||
"$setOnInsert": bson.M{
|
||||
"accid": newaccid,
|
||||
"create": createtime,
|
||||
},
|
||||
}, options.FindOneAndUpdate().SetReturnDocument(options.After).SetUpsert(true).SetProjection(bson.M{"accid": 1, "create": 1}))
|
||||
if err != nil {
|
||||
logger.Error("authorize failed. Update sh.ServiceName err:", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
linkid := link["_id"].(primitive.ObjectID)
|
||||
newaccid := primitive.NewObjectID()
|
||||
for i := 0; i < len(sh.serviceCodeBytes); i++ {
|
||||
newaccid[i] ^= sh.serviceCodeBytes[i]
|
||||
}
|
||||
account, err := sh.mongoClient.FindOneAndUpdate(CollectionAccount, bson.M{
|
||||
"_id": linkid,
|
||||
}, bson.M{
|
||||
"$setOnInsert": bson.M{
|
||||
"accid": newaccid,
|
||||
"create": createtime,
|
||||
},
|
||||
}, options.FindOneAndUpdate().SetReturnDocument(options.After).SetUpsert(true).SetProjection(bson.M{"accid": 1, "create": 1}))
|
||||
if err != nil {
|
||||
logger.Error("authorize failed. Update sh.ServiceName err:", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
accid := account["accid"].(primitive.ObjectID)
|
||||
oldcreate := account["create"].(primitive.DateTime)
|
||||
newaccount := oldcreate == createtime
|
||||
|
||||
accid := account["accid"].(primitive.ObjectID)
|
||||
oldcreate := account["create"].(primitive.DateTime)
|
||||
newaccount := oldcreate == createtime
|
||||
var bi *blockinfo
|
||||
if sh.bl.contains(accid, &bi) {
|
||||
// 블럭된 계정. 블락 정보를 알려준다.
|
||||
w.Header().Add("MG-ACCOUNTBLOCK-START", strconv.FormatInt(bi.Start.Time().Unix(), 10))
|
||||
w.Header().Add("MG-ACCOUNTBLOCK-END", strconv.FormatInt(bi.End.Time().Unix(), 10))
|
||||
w.Header().Add("MG-ACCOUNTBLOCK-REASON", bi.Reason)
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
var bi *blockinfo
|
||||
if sh.bl.contains(accid, &bi) {
|
||||
// 블럭된 계정. 블락 정보를 알려준다.
|
||||
w.Header().Add("MG-ACCOUNTBLOCK-START", strconv.FormatInt(bi.Start.Time().Unix(), 10))
|
||||
w.Header().Add("MG-ACCOUNTBLOCK-END", strconv.FormatInt(bi.End.Time().Unix(), 10))
|
||||
w.Header().Add("MG-ACCOUNTBLOCK-REASON", bi.Reason)
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
newsession := primitive.NewObjectID()
|
||||
expired := primitive.NewDateTimeFromTime(time.Now().UTC().Add(sh.sessionTTL))
|
||||
newauth := gocommon.Authinfo{
|
||||
Accid: accid,
|
||||
ServiceCode: sh.ServiceCode,
|
||||
Platform: authtype,
|
||||
Uid: uid,
|
||||
Email: email,
|
||||
Sk: newsession,
|
||||
Expired: expired,
|
||||
//RefreshToken: queryvals.Get("rt"),
|
||||
}
|
||||
|
||||
sk, err := sh.sessionProvider.New(&session.Authorization{
|
||||
Account: accid,
|
||||
Platform: authtype,
|
||||
Uid: uid,
|
||||
Email: email,
|
||||
})
|
||||
if err != nil {
|
||||
logger.Error("authorize failed. sessionProvider.New err:", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
_, _, err = sh.mongoClient.UpsertOne(CollectionAuth, bson.M{"_id": newauth.Accid}, &newauth)
|
||||
if err != nil {
|
||||
logger.Error("authorize failed :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
output := map[string]any{
|
||||
"sk": sk,
|
||||
"expirein": sh.sessionTTL.Seconds(),
|
||||
"newAccount": newaccount,
|
||||
"accid": accid.Hex(),
|
||||
}
|
||||
if *noauth {
|
||||
output["noauth"] = true
|
||||
}
|
||||
logger.Println("session created :", accid, authtype, uid, email, newsession)
|
||||
|
||||
json.NewEncoder(w).Encode(output)
|
||||
output := map[string]any{
|
||||
"sk": newsession.Hex(),
|
||||
"expirein": sh.sessionTTL.Seconds(),
|
||||
"newAccount": newaccount,
|
||||
"accid": newauth.Accid.Hex(),
|
||||
}
|
||||
if *noauth {
|
||||
output["noauth"] = true
|
||||
}
|
||||
|
||||
if link["_ts"] != nil {
|
||||
delts := link["_ts"].(primitive.DateTime)
|
||||
if !delts.Time().IsZero() {
|
||||
// 삭제된 계정. 삭제 되었다고 알려주자
|
||||
w.Header().Add("MG-ACCOUNT-DELETED", "TRUE")
|
||||
}
|
||||
}
|
||||
bt, _ := json.Marshal(output)
|
||||
w.Write(bt)
|
||||
} else if len(session) > 0 {
|
||||
sessionobj, _ := primitive.ObjectIDFromHex(session)
|
||||
if !sessionobj.IsZero() {
|
||||
updated, _, err := sh.mongoClient.Update(CollectionAuth,
|
||||
bson.M{
|
||||
"sk": sessionobj,
|
||||
},
|
||||
bson.M{
|
||||
"$currentDate": bson.M{
|
||||
"_ts": bson.M{"$type": "date"},
|
||||
},
|
||||
}, options.Update().SetUpsert(false))
|
||||
if err != nil {
|
||||
logger.Error("update auth collection failed :", err)
|
||||
return
|
||||
}
|
||||
|
||||
if !updated {
|
||||
// 세션이 없네?
|
||||
logger.Println("authorize failed. session not exists in database :", session)
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
output := map[string]any{
|
||||
"sk": session,
|
||||
"expirein": sh.sessionTTL.Seconds(),
|
||||
}
|
||||
|
||||
logger.Println("session updated :", authtype, uid, session)
|
||||
|
||||
bt, _ := json.Marshal(output)
|
||||
w.Write(bt)
|
||||
} else {
|
||||
logger.Println("authorize failed. sk is not valid hex :", session)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
logger.Println("authorize failed. id empty :", queryvals)
|
||||
}
|
||||
}
|
||||
|
||||
func (sh *serviceDescription) findVersionSplit(version string) []byte {
|
||||
@ -706,6 +817,101 @@ func (sh *serviceDescription) findVersionSplit(version string) []byte {
|
||||
return sh.divisionsSplits["default"]
|
||||
}
|
||||
|
||||
func (sh *serviceDescription) delacc(w http.ResponseWriter, r *http.Request) {
|
||||
defer func() {
|
||||
s := recover()
|
||||
if s != nil {
|
||||
logger.Error(s)
|
||||
}
|
||||
}()
|
||||
|
||||
if r.Method != "GET" {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
queryvals := r.URL.Query()
|
||||
sType := queryvals.Get("stype")
|
||||
sId := queryvals.Get("sid")
|
||||
sk := queryvals.Get("sk")
|
||||
cancel := queryvals.Has("cancel")
|
||||
|
||||
authInfo := sh.auths.Find(sk)
|
||||
if authInfo == nil {
|
||||
// 잘못된 세션
|
||||
logger.Println("delacc failed. session key is not valid :", sk)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if authInfo.Uid != sId || authInfo.Platform != sType {
|
||||
logger.Println("delacc failed. session key is not correct :", *authInfo, queryvals)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
linkidMap, err := sh.mongoClient.FindAll(CollectionAccount, bson.M{
|
||||
"accid": authInfo.Accid,
|
||||
}, options.Find().SetProjection(bson.M{
|
||||
"_id": 1,
|
||||
}))
|
||||
if err != nil {
|
||||
logger.Error("delacc failed. FindAll account err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
var linkidAry primitive.A
|
||||
for _, linkid := range linkidMap {
|
||||
linkidAry = append(linkidAry, linkid["_id"].(primitive.ObjectID))
|
||||
}
|
||||
|
||||
delfilter := primitive.M{"_id": bson.M{"$in": linkidAry}}
|
||||
var delop primitive.M
|
||||
if !cancel {
|
||||
curtime := primitive.NewDateTimeFromTime(time.Now().UTC())
|
||||
delop = primitive.M{
|
||||
"$set": primitive.M{"_ts": curtime},
|
||||
}
|
||||
|
||||
if sType == AuthPlatformFirebaseAuth {
|
||||
sh.mongoClient.Delete(CollectionFirebaseUserInfo, bson.M{
|
||||
"firebaseuserid": sId,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
delfilter["platform"] = sType
|
||||
targetLinkId, err := sh.mongoClient.FindAll(CollectionLink, delfilter, options.Find().SetProjection(bson.M{
|
||||
"_id": 1,
|
||||
}))
|
||||
if len(targetLinkId) != 1 {
|
||||
logger.Error("delacc failed. FindAll link err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
delfilter = primitive.M{"_id": targetLinkId[0]["_id"].(primitive.ObjectID)}
|
||||
delop = primitive.M{
|
||||
"$unset": primitive.M{"_ts": true},
|
||||
}
|
||||
}
|
||||
updated, _, err := sh.mongoClient.Update(CollectionAccount, delfilter, delop, options.Update().SetUpsert(false))
|
||||
if !updated || err != nil {
|
||||
logger.Error("delacc failed. Update CollectionAccount timestamp err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
updated, _, err = sh.mongoClient.Update(CollectionLink, delfilter, delop, options.Update().SetUpsert(false))
|
||||
if !updated || err != nil {
|
||||
logger.Error("delacc failed. Update CollectionLink timestamp err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
logger.Println("delacc success :", linkidMap)
|
||||
}
|
||||
|
||||
func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
defer func() {
|
||||
s := recover()
|
||||
@ -727,6 +933,8 @@ func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request)
|
||||
sh.unlink(w, r)
|
||||
} else if strings.HasSuffix(r.URL.Path, "/linkinfo") {
|
||||
sh.linkinfo(w, r)
|
||||
} else if strings.HasSuffix(r.URL.Path, "/delacc") {
|
||||
sh.delacc(w, r)
|
||||
} else if strings.HasSuffix(r.URL.Path, "/divs") {
|
||||
// TODO : 세션키와 authtoken을 헤더로 받아서 accid 조회
|
||||
queryvals := r.URL.Query()
|
||||
@ -741,14 +949,7 @@ func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request)
|
||||
// TODO : 각 서버에 있는 자산? 캐릭터 정보를 보여줘야 하나. 뭘 보여줄지는 프로젝트에 문의
|
||||
// 일단 서버 종류만 내려보내자
|
||||
// 세션키가 있는지 확인
|
||||
authInfo, err := sh.sessionProvider.Query(sk)
|
||||
if err != nil {
|
||||
logger.Println("sessionProvider.Query return err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if authInfo.Account.IsZero() {
|
||||
if _, ok := sh.auths.IsValid(sk, ""); !ok {
|
||||
logger.Println("sessionkey is not valid :", sk)
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
@ -769,14 +970,7 @@ func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request)
|
||||
// TODO : 각 서버에 있는 자산? 캐릭터 정보를 보여줘야 하나. 뭘 보여줄지는 프로젝트에 문의
|
||||
// 일단 서버 종류만 내려보내자
|
||||
// 세션키가 있는지 확인
|
||||
authInfo, err := sh.sessionProvider.Query(sk)
|
||||
if err != nil {
|
||||
logger.Println("sessionProvider.Query return err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if authInfo.Account.IsZero() {
|
||||
if _, ok := sh.auths.IsValid(sk, ""); !ok {
|
||||
logger.Println("sessionkey is not valid :", sk)
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
@ -792,14 +986,13 @@ func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request)
|
||||
|
||||
case DivisionState_RestrictedOpen:
|
||||
// 점검중이면 whitelist만 입장 가능
|
||||
authInfo, err := sh.sessionProvider.Query(sk)
|
||||
if err != nil {
|
||||
logger.Println("sessionProvider.Query return err :", err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
cell := sh.auths.QuerySession(sk, "")
|
||||
if cell == nil {
|
||||
logger.Println("sessionkey is not valid :", sk)
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
wm := &whitelistmember{Email: authInfo.Email, Platform: authInfo.Platform}
|
||||
wm := &whitelistmember{Email: cell.ToAuthinfo().Email, Platform: cell.ToAuthinfo().Platform}
|
||||
if sh.wl.contains(wm.Key(), nil) {
|
||||
// qa 권한이면 입장 가능
|
||||
w.Write([]byte(fmt.Sprintf(`{"service":"%s"}`, div.Url)))
|
||||
|
||||
@ -10,6 +10,7 @@ import (
|
||||
"time"
|
||||
"unsafe"
|
||||
|
||||
"repositories.action2quare.com/ayo/gocommon"
|
||||
"repositories.action2quare.com/ayo/gocommon/logger"
|
||||
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
@ -18,6 +19,14 @@ import (
|
||||
"go.mongodb.org/mongo-driver/mongo/options"
|
||||
)
|
||||
|
||||
type authPipelineDocument struct {
|
||||
OperationType string `bson:"operationType"`
|
||||
DocumentKey struct {
|
||||
Id primitive.ObjectID `bson:"_id"`
|
||||
} `bson:"documentKey"`
|
||||
Authinfo *gocommon.Authinfo `bson:"fullDocument"`
|
||||
}
|
||||
|
||||
type servicePipelineDocument struct {
|
||||
OperationType string `bson:"operationType"`
|
||||
DocumentKey struct {
|
||||
@ -213,3 +222,87 @@ func (mg *Maingate) watchServiceCollection(parentctx context.Context, serveMux *
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func watchAuthCollection(parentctx context.Context, ac *gocommon.AuthCollection, mongoClient gocommon.MongoClient) {
|
||||
defer func() {
|
||||
s := recover()
|
||||
if s != nil {
|
||||
logger.Error(s)
|
||||
}
|
||||
}()
|
||||
|
||||
matchStage := bson.D{
|
||||
{
|
||||
Key: "$match", Value: bson.D{
|
||||
{Key: "operationType", Value: bson.D{
|
||||
{Key: "$in", Value: bson.A{
|
||||
"delete",
|
||||
"insert",
|
||||
"update",
|
||||
}},
|
||||
}},
|
||||
},
|
||||
}}
|
||||
projectStage := bson.D{
|
||||
{
|
||||
Key: "$project", Value: bson.D{
|
||||
{Key: "documentKey", Value: 1},
|
||||
{Key: "operationType", Value: 1},
|
||||
{Key: "fullDocument", Value: 1},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
var stream *mongo.ChangeStream
|
||||
var err error
|
||||
var ctx context.Context
|
||||
|
||||
for {
|
||||
if stream == nil {
|
||||
stream, err = mongoClient.Watch(CollectionAuth, mongo.Pipeline{matchStage, projectStage})
|
||||
if err != nil {
|
||||
logger.Error("watchAuthCollection watch failed :", err)
|
||||
time.Sleep(time.Minute)
|
||||
continue
|
||||
}
|
||||
ctx = context.TODO()
|
||||
}
|
||||
|
||||
changed := stream.TryNext(ctx)
|
||||
if ctx.Err() != nil {
|
||||
logger.Error("watchAuthCollection stream.TryNext failed. process should be restarted! :", ctx.Err().Error())
|
||||
break
|
||||
}
|
||||
|
||||
if changed {
|
||||
var data authPipelineDocument
|
||||
if err := stream.Decode(&data); err == nil {
|
||||
ot := data.OperationType
|
||||
switch ot {
|
||||
case "insert":
|
||||
ac.AddRaw(&mongoAuthCell{src: data.Authinfo})
|
||||
case "update":
|
||||
ac.AddRaw(&mongoAuthCell{src: data.Authinfo})
|
||||
case "delete":
|
||||
ac.RemoveByAccId(data.DocumentKey.Id)
|
||||
}
|
||||
} else {
|
||||
logger.Error("watchAuthCollection stream.Decode failed :", err)
|
||||
}
|
||||
} else if stream.Err() != nil || stream.ID() == 0 {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
logger.Println("watchAuthCollection is done")
|
||||
stream.Close(ctx)
|
||||
return
|
||||
|
||||
case <-time.After(time.Second):
|
||||
logger.Error("watchAuthCollection stream error :", stream.Err())
|
||||
stream.Close(ctx)
|
||||
stream = nil
|
||||
}
|
||||
} else {
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
6
go.mod
6
go.mod
@ -1,13 +1,13 @@
|
||||
module repositories.action2quare.com/ayo/maingate
|
||||
|
||||
go 1.19
|
||||
go 1.18
|
||||
|
||||
require (
|
||||
firebase.google.com/go v3.13.0+incompatible
|
||||
github.com/golang-jwt/jwt v3.2.2+incompatible
|
||||
go.mongodb.org/mongo-driver v1.11.7
|
||||
google.golang.org/api v0.128.0
|
||||
repositories.action2quare.com/ayo/gocommon v0.0.0-20231128132952-e5a5240f96d8
|
||||
repositories.action2quare.com/ayo/gocommon v0.0.0-20230912075917-f9a146321cdb
|
||||
)
|
||||
|
||||
require (
|
||||
@ -53,3 +53,5 @@ require (
|
||||
google.golang.org/grpc v1.56.0 // indirect
|
||||
google.golang.org/protobuf v1.30.0 // indirect
|
||||
)
|
||||
|
||||
replace repositories.action2quare.com/ayo/maingate => ./
|
||||
|
||||
4
go.sum
4
go.sum
@ -268,5 +268,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
repositories.action2quare.com/ayo/gocommon v0.0.0-20231128132952-e5a5240f96d8 h1:GbvfiscAV/gquGzC9bJ3RTNtezLcdfGOv+9JmAZYQVc=
|
||||
repositories.action2quare.com/ayo/gocommon v0.0.0-20231128132952-e5a5240f96d8/go.mod h1:XvklTTSvQX5uviivGBcZo8eIL+mV94W2e4uBBXcT5JY=
|
||||
repositories.action2quare.com/ayo/gocommon v0.0.0-20230912075917-f9a146321cdb h1:Rdf6uhBIWunRLZ2LIT1hSovYXxZoOzx9mdSK5bjWpos=
|
||||
repositories.action2quare.com/ayo/gocommon v0.0.0-20230912075917-f9a146321cdb/go.mod h1:rn6NA28Mej+qgLNx/Bu2wsdGyIycmacqlNP6gUXX2a0=
|
||||
|
||||
15
main.go
15
main.go
@ -2,7 +2,9 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"math/rand"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"repositories.action2quare.com/ayo/gocommon"
|
||||
"repositories.action2quare.com/ayo/gocommon/flagx"
|
||||
@ -19,29 +21,26 @@ func main() {
|
||||
flagx.Parse()
|
||||
|
||||
logger.Println("build revision =", revision)
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
mg, err := core.New(ctx)
|
||||
if err != nil {
|
||||
logger.Error("core.New failed :", err)
|
||||
return
|
||||
panic(err)
|
||||
}
|
||||
defer mg.Destructor()
|
||||
|
||||
serveMux := http.NewServeMux()
|
||||
if err := mg.RegisterHandlers(ctx, serveMux, *prefix); err != nil {
|
||||
logger.Error("RegisterHandlers failed :", err)
|
||||
return
|
||||
panic(err)
|
||||
}
|
||||
|
||||
server := gocommon.NewHTTPServer(serveMux)
|
||||
logger.Println("maingate is started")
|
||||
|
||||
if err := server.Start(); err != nil {
|
||||
logger.Error("maingate is stopped with error :", err)
|
||||
}
|
||||
|
||||
logger.Println("maingate is terminated")
|
||||
cancel()
|
||||
mg.Destructor()
|
||||
}
|
||||
|
||||
14
make_maingate_package.ps1
Normal file
14
make_maingate_package.ps1
Normal file
@ -0,0 +1,14 @@
|
||||
# $ErrorActionPreference = 'SilentlyContinue'
|
||||
|
||||
$CurBranch = git branch --show-current
|
||||
|
||||
Remove-Item maingate.zip -Force -Recurse -ErrorAction SilentlyContinue
|
||||
|
||||
$Env:GOOS="linux"
|
||||
$Env:GOARCH="amd64"
|
||||
go build -ldflags="-s -w" .
|
||||
|
||||
Compress-Archive -Path maingate -Update -DestinationPath maingate.zip
|
||||
Compress-Archive -Path *-firebase-*.json -Update -DestinationPath maingate.zip
|
||||
Compress-Archive -Path fba -Update -DestinationPath maingate.zip
|
||||
Compress-Archive -Path template -Update -DestinationPath maingate.zip
|
||||
Reference in New Issue
Block a user