zydronium/rdpgw
1
0
Fork 0
mirror of https://github.com/bolkedebruin/rdpgw.git synced 2025-08-18 06:23:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

testing

Browse source
This commit is contained in:
Bolke de Bruin 2020-08-07 08:54:29 +02:00
parent fdffd962f0
commit a01ee3444e
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/web.go
View file

@ -182,6 +182,6 @@ func (c *Config) HandleDownload(w http.ResponseWriter, r *http.Request) {
"networkautodetect:i:"+strconv.Itoa(c.NetworkAutoDetect)+"\r\n"+ "networkautodetect:i:"+strconv.Itoa(c.NetworkAutoDetect)+"\r\n"+
"bandwidthautodetect:i:"+strconv.Itoa(c.BandwidthAutoDetect)+"\r\n"+ "bandwidthautodetect:i:"+strconv.Itoa(c.BandwidthAutoDetect)+"\r\n"+
"connection type:i:"+strconv.Itoa(c.ConnectionType)+"\r\n"+ "connection type:i:"+strconv.Itoa(c.ConnectionType)+"\r\n"+
"username:s:"+user+"\r\n"+ "username:s:"+token+"\r\n"+
"bitmapcachesize:i:32000\r\n")) "bitmapcachesize:i:32000\r\n"))
} }

2
protocol/common.go
View file

@ -110,6 +110,7 @@ func forward(in net.Conn, out transport.Transport) {
b1.Write(buf[:n]) b1.Write(buf[:n])
out.WritePacket(createPacket(PKT_TYPE_DATA, b1.Bytes())) out.WritePacket(createPacket(PKT_TYPE_DATA, b1.Bytes()))
b1.Reset() b1.Reset()
log.Printf("Forward data")
} }
} }
@ -123,5 +124,6 @@ func receive(data []byte, out net.Conn) {
binary.Read(buf, binary.LittleEndian, &pkt) binary.Read(buf, binary.LittleEndian, &pkt)
out.Write(pkt) out.Write(pkt)
log.Printf("Received data")
} }

2
protocol/server.go
View file

@ -66,6 +66,7 @@ func (s *Server) Process(ctx context.Context) error {
return err return err
} }
log.Printf("%x", pkt)
switch pt { switch pt {
case PKT_TYPE_HANDSHAKE_REQUEST: case PKT_TYPE_HANDSHAKE_REQUEST:
log.Printf("Client handshakeRequest from %s", common.GetClientIp(ctx)) log.Printf("Client handshakeRequest from %s", common.GetClientIp(ctx))
@ -141,6 +142,7 @@ func (s *Server) Process(ctx context.Context) error {
go forward(s.Remote, s.Session.TransportOut) go forward(s.Remote, s.Session.TransportOut)
s.State = SERVER_STATE_CHANNEL_CREATE s.State = SERVER_STATE_CHANNEL_CREATE
case PKT_TYPE_DATA: case PKT_TYPE_DATA:
log.Printf("Data received")
if s.State < SERVER_STATE_CHANNEL_CREATE { if s.State < SERVER_STATE_CHANNEL_CREATE {
log.Printf("Data received while in wrong state %d != %d", s.State, SERVER_STATE_CHANNEL_CREATE) log.Printf("Data received while in wrong state %d != %d", s.State, SERVER_STATE_CHANNEL_CREATE)
return errors.New("wrong state") return errors.New("wrong state")

4
security/jwt.go
View file

@ -55,11 +55,11 @@ func VerifyServerFunc(ctx context.Context, host string) (bool, error) {
return false, nil return false, nil
} }
if s.ClientIp != common.GetClientIp(ctx) { /*if s.ClientIp != common.GetClientIp(ctx) {
log.Printf("Current client ip address %s does not match token client ip %s", log.Printf("Current client ip address %s does not match token client ip %s",
common.GetClientIp(ctx), s.ClientIp) common.GetClientIp(ctx), s.ClientIp)
return false, nil return false, nil
} }*/
return true, nil return true, nil
} }