overflow_backup_2018_0455/overflow_probes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2017-12-09 17:41:43 +09:00
parent 14c4949480
commit 2551703bc2
7 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
auth/service/NoAuthProbeService.go
View File

@ -9,8 +9,6 @@ import (
cc "git.loafle.net/commons_go/config" cc "git.loafle.net/commons_go/config"
ooccn "git.loafle.net/overflow/overflow_commons_go/config/noauthprobe" ooccn "git.loafle.net/overflow/overflow_commons_go/config/noauthprobe"
oocmn "git.loafle.net/overflow/overflow_commons_go/modules/noauthprobe" oocmn "git.loafle.net/overflow/overflow_commons_go/modules/noauthprobe"
noauthprobeM "git.loafle.net/overflow/overflow_commons_go/modules/noauthprobe/model"
probeM "git.loafle.net/overflow/overflow_commons_go/modules/probe/model"
oopai "git.loafle.net/overflow/overflow_probes/auth/info" oopai "git.loafle.net/overflow/overflow_probes/auth/info"
"git.loafle.net/overflow/overflow_probes/config" "git.loafle.net/overflow/overflow_probes/config"
) )
@ -22,26 +20,31 @@ type NoAuthProbeService struct {
Config ooccn.NoAuthProbeConfig Config ooccn.NoAuthProbeConfig
} }
func (s *NoAuthProbeService) Accept(probe *probeM.Probe) { func (s *NoAuthProbeService) Accept(probeKey string) error {
config.Config.Probe.Key = &probe.ProbeKey config.Config.Probe.Key = &probeKey
if err := cc.Save(*config.Config, *config.ConfigFilePath, true); nil != err { if err := cc.Save(*config.Config, *config.ConfigFilePath, true); nil != err {
s.DoneChan <- fmt.Errorf("Auth: Saving of config file[%s] failed error[%v]", *config.ConfigFilePath, err) s.DoneChan <- fmt.Errorf("Auth: Saving of config file[%s] failed error[%v]", *config.ConfigFilePath, err)
return return nil
} }
logging.Logger().Info(fmt.Sprintf("Auth: Probe[%s] has been accepted from central", probeKey))
s.DoneChan <- nil s.DoneChan <- nil
return nil
} }
func (s *NoAuthProbeService) Deny(noAuthProbe *noauthprobeM.NoAuthProbe) { func (s *NoAuthProbeService) Deny() error {
n := time.Now() n := time.Now()
s.Config.DenyDate = &n s.Config.DenyDate = &n
if err := cc.Save(s.Config, s.ConfigPath, true); nil != err { if err := cc.Save(s.Config, s.ConfigPath, true); nil != err {
s.DoneChan <- fmt.Errorf("Auth: Saving of NoAuth config file[%s] failed error[%v]", s.ConfigPath, err) s.DoneChan <- fmt.Errorf("Auth: Saving of NoAuth config file[%s] failed error[%v]", s.ConfigPath, err)
return return nil
} }
logging.Logger().Info(fmt.Sprintf("Auth: Probe has been denyed from central"))
s.DoneChan <- nil s.DoneChan <- nil
return nil
} }
func (s *NoAuthProbeService) GetRequestHeader() map[string][]string { func (s *NoAuthProbeService) GetRequestHeader() map[string][]string {
@ -53,7 +56,7 @@ func (s *NoAuthProbeService) GetRequestHeader() map[string][]string {
case ooccn.NoAuthProbeStateTypeRegisterd: case ooccn.NoAuthProbeStateTypeRegisterd:
header[oocmn.HTTPRequestHeaderKey_NoAuthProbe_Method] = []string{oocmn.HTTPRequestHeaderValue_NoAuthProbe_Method_Connect} header[oocmn.HTTPRequestHeaderKey_NoAuthProbe_Method] = []string{oocmn.HTTPRequestHeaderValue_NoAuthProbe_Method_Connect}
header[oocmn.HTTPRequestHeaderKey_NoAuthProbe_TempProbeKey] = []string{oocmn.HTTPRequestHeaderValue_NoAuthProbe_Method_Connect} header[oocmn.HTTPRequestHeaderKey_NoAuthProbe_TempProbeKey] = []string{*s.Config.TempKey}
} }
return header return header

2
client/central/data/socket_builders.go
View File

@ -8,7 +8,7 @@ import (
func newSocketBuilder() cwfc.SocketBuilder { func newSocketBuilder() cwfc.SocketBuilder {
sb := &SocketBuilders{} sb := &SocketBuilders{}
sb.SocketBuilders = oopcc.NewSocketBuilder(oocmp.HTTPEntry_Probe) sb.SocketBuilders = oopcc.NewSocketBuilder(oocmp.HTTPEntry_Data)
if nil == sb.SocketBuilders { if nil == sb.SocketBuilders {
return nil return nil
} }

2
client/central/data/socket_handlers.go
View File

@ -18,7 +18,7 @@ func (sh *SocketHandlers) OnConnect(socketContext cwfc.SocketContext, res *http.
} }
func (sh *SocketHandlers) OnDisconnect(soc cwfc.Socket) { func (sh *SocketHandlers) OnDisconnect(soc cwfc.Socket) {
logging.Logger().Info(fmt.Sprintf("Auth: client has been disconnected soc[%v]", soc)) logging.Logger().Info(fmt.Sprintf("Probe: client has been disconnected soc[%v]", soc))
} }

2
client/central/probe/socket_handlers.go
View File

@ -22,7 +22,7 @@ func (sh *SocketHandlers) OnConnect(socketContext cwfc.SocketContext, res *http.
} }
func (sh *SocketHandlers) OnDisconnect(soc cwfc.Socket) { func (sh *SocketHandlers) OnDisconnect(soc cwfc.Socket) {
logging.Logger().Info(fmt.Sprintf("Auth: client has been disconnected soc[%v]", soc)) logging.Logger().Info(fmt.Sprintf("Probe: client has been disconnected soc[%v]", soc))
} }

2
client/central/socket_builders.go
View File

@ -10,7 +10,7 @@ import (
func NewSocketBuilder(entryPath string) *SocketBuilders { func NewSocketBuilder(entryPath string) *SocketBuilders {
sb := &SocketBuilders{} sb := &SocketBuilders{}
sb.SocketBuilders = oopccc.NewSocketBuilder(oocmp.HTTPEntry_Probe) sb.SocketBuilders = oopccc.NewSocketBuilder(entryPath)
if nil == sb.SocketBuilders { if nil == sb.SocketBuilders {
return nil return nil
} }

7
config.json
View File

@ -5,10 +5,13 @@
"readBufferSize": 8192, "readBufferSize": 8192,
"writeBufferSize": 8192 "writeBufferSize": 8192
}, },
"probe": {
"key": "95d8bcdc739741dca74c4a0e489e0774"
},
"paths": { "paths": {
"root": "",
"bin": "bin", "bin": "bin",
"config": "config", "config": "config",
"pid": "pid" "pid": "pid",
"root": ""
} }
} }

3
noauthprobe.json Normal file
View File

@ -0,0 +1,3 @@
{
"tempKey": "969946e1-4de3-486a-b11c-00d311244c3a"
}