This commit is contained in:
evilsocket 2018-01-24 14:08:47 +01:00
commit e0102ec9e0

View file

@ -12,12 +12,13 @@ import (
) )
type ProxyScript struct { type ProxyScript struct {
sync.Mutex
Path string Path string
Source string Source string
VM *otto.Otto VM *otto.Otto
sess *session.Session sess *session.Session
gil *sync.Mutex
onRequestScript *otto.Script onRequestScript *otto.Script
onResponseScript *otto.Script onResponseScript *otto.Script
cbCacheLock *sync.Mutex cbCacheLock *sync.Mutex
@ -31,7 +32,6 @@ func LoadProxyScriptSource(path, source string, sess *session.Session) (err erro
VM: otto.New(), VM: otto.New(),
sess: sess, sess: sess,
gil: &sync.Mutex{},
onRequestScript: nil, onRequestScript: nil,
onResponseScript: nil, onResponseScript: nil,
cbCacheLock: &sync.Mutex{}, cbCacheLock: &sync.Mutex{},
@ -153,8 +153,8 @@ func (s *ProxyScript) doResponseDefines(res *http.Response) (err error, jsres *J
func (s *ProxyScript) OnRequest(req *http.Request) *JSResponse { func (s *ProxyScript) OnRequest(req *http.Request) *JSResponse {
if s.onRequestScript != nil { if s.onRequestScript != nil {
s.gil.Lock() s.Lock()
defer s.gil.Unlock() defer s.Unlock()
err, jsres := s.doRequestDefines(req) err, jsres := s.doRequestDefines(req)
if err != nil { if err != nil {
@ -178,8 +178,8 @@ func (s *ProxyScript) OnRequest(req *http.Request) *JSResponse {
func (s *ProxyScript) OnResponse(res *http.Response) *JSResponse { func (s *ProxyScript) OnResponse(res *http.Response) *JSResponse {
if s.onResponseScript != nil { if s.onResponseScript != nil {
s.gil.Lock() s.Lock()
defer s.gil.Unlock() defer s.Unlock()
err, jsres := s.doResponseDefines(res) err, jsres := s.doResponseDefines(res)
if err != nil { if err != nil {