ayo/maingate
8
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

dev용 serverHTTP 추가

Browse Source
This commit is contained in:
mountain
2023-12-25 22:08:22 +09:00
parent 2e60fac840
commit da68071e97
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/maingate.go
View File

@ -454,9 +454,11 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
} }
logger.Println("Service is registered :", mg.service().ServiceCode) logger.Println("Service is registered :", mg.service().ServiceCode)
serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, mg.service().ServiceCode, "/"), func(w http.ResponseWriter, r *http.Request) { if *devflag {
mg.service().serveHTTP(w, r) serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, mg.service().ServiceCode, "/"), mg.service().serveHTTP_dev)
}) } else {
serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, mg.service().ServiceCode, "/"), mg.service().serveHTTP)
}
serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, "api/"), mg.api) serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, "api/"), mg.api)
configraw, _ := json.Marshal(config) configraw, _ := json.Marshal(config)

20
core/service.go
View File

@ -533,6 +533,18 @@ func (sh *serviceDescription) linkinfo(w http.ResponseWriter, r *http.Request) {
} }
func (sh *serviceDescription) authorize_dev(w http.ResponseWriter, r *http.Request) {
if r.Method == "DELETE" {
sk := r.Header.Get("AS-X-SESSION")
if authinfo, err := sh.sessionProvider.Query(sk); err == nil {
sh.sessionProvider.Delete(authinfo.Account)
}
return
}
sh.authorize(w, r)
}
func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request) { func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request) {
defer func() { defer func() {
s := recover() s := recover()
@ -698,6 +710,14 @@ func (sh *serviceDescription) findVersionSplit(version string) []byte {
return sh.divisionsSplits["default"] return sh.divisionsSplits["default"]
} }
func (sh *serviceDescription) serveHTTP_dev(w http.ResponseWriter, r *http.Request) {
if strings.HasSuffix(r.URL.Path, "/auth") {
sh.authorize_dev(w, r)
} else {
sh.serveHTTP(w, r)
}
}
func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request) { func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request) {
defer func() { defer func() {
s := recover() s := recover()