diff --git a/common/network.go b/common/network.go index cdc2d9a..f45abb8 100644 --- a/common/network.go +++ b/common/network.go @@ -103,7 +103,7 @@ func createProxyConfig(timeout time.Duration) *proxy.ProxyConfig { // TCP 连接 // ============================================================================= -// Deprecated: WrapperTcpWithTimeout 仅供 mylib/grdp 兼容使用，新代码请用 ScanSession.DialTCP +// Deprecated: WrapperTcpWithTimeout 仅供 libs/grdp 兼容使用，新代码请用 ScanSession.DialTCP // //nolint:revive func WrapperTcpWithTimeout(network, address string, timeout time.Duration) (net.Conn, error) { diff --git a/mylib/grdp/.gitattributes b/libs/grdp/.gitattributes similarity index 100% rename from mylib/grdp/.gitattributes rename to libs/grdp/.gitattributes diff --git a/mylib/grdp/.gitignore b/libs/grdp/.gitignore similarity index 100% rename from mylib/grdp/.gitignore rename to libs/grdp/.gitignore diff --git a/mylib/grdp/LICENSE b/libs/grdp/LICENSE similarity index 100% rename from mylib/grdp/LICENSE rename to libs/grdp/LICENSE diff --git a/mylib/grdp/README.md b/libs/grdp/README.md similarity index 100% rename from mylib/grdp/README.md rename to libs/grdp/README.md diff --git a/mylib/grdp/core/io.go b/libs/grdp/core/io.go similarity index 98% rename from mylib/grdp/core/io.go rename to libs/grdp/core/io.go index de810d2..11b35ec 100644 --- a/mylib/grdp/core/io.go +++ b/libs/grdp/core/io.go @@ -2,7 +2,7 @@ package core import ( "encoding/binary" - "github.com/shadow1ng/fscan/mylib/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/glog" "io" ) diff --git a/mylib/grdp/core/socket.go b/libs/grdp/core/socket.go similarity index 100% rename from mylib/grdp/core/socket.go rename to libs/grdp/core/socket.go diff --git a/mylib/grdp/core/types.go b/libs/grdp/core/types.go similarity index 90% rename from mylib/grdp/core/types.go rename to libs/grdp/core/types.go index ba75edd..40335f8 100644 --- a/mylib/grdp/core/types.go +++ b/libs/grdp/core/types.go @@ -1,6 +1,6 @@ package core -import "github.com/shadow1ng/fscan/mylib/grdp/emission" +import "github.com/shadow1ng/fscan/libs/grdp/emission" type Transport interface { Read(b []byte) (n int, err error) diff --git a/mylib/grdp/core/util.go b/libs/grdp/core/util.go similarity index 100% rename from mylib/grdp/core/util.go rename to libs/grdp/core/util.go diff --git a/mylib/grdp/emission/emitter.go b/libs/grdp/emission/emitter.go similarity index 100% rename from mylib/grdp/emission/emitter.go rename to libs/grdp/emission/emitter.go diff --git a/mylib/grdp/glog/log.go b/libs/grdp/glog/log.go similarity index 100% rename from mylib/grdp/glog/log.go rename to libs/grdp/glog/log.go diff --git a/mylib/grdp/login/screen.go b/libs/grdp/login/screen.go similarity index 93% rename from mylib/grdp/login/screen.go rename to libs/grdp/login/screen.go index 27f86b9..a994bc8 100644 --- a/mylib/grdp/login/screen.go +++ b/libs/grdp/login/screen.go @@ -3,14 +3,14 @@ package login import ( "errors" "fmt" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/glog" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/nla" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/pdu" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/sec" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/tpkt" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/x224" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/protocol/nla" + "github.com/shadow1ng/fscan/libs/grdp/protocol/pdu" + "github.com/shadow1ng/fscan/libs/grdp/protocol/sec" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125" + "github.com/shadow1ng/fscan/libs/grdp/protocol/tpkt" + "github.com/shadow1ng/fscan/libs/grdp/protocol/x224" "golang.org/x/net/context" "golang.org/x/net/proxy" "log" diff --git a/mylib/grdp/protocol/lic/lic.go b/libs/grdp/protocol/lic/lic.go similarity index 99% rename from mylib/grdp/protocol/lic/lic.go rename to libs/grdp/protocol/lic/lic.go index 7cf6bda..8c74d45 100644 --- a/mylib/grdp/protocol/lic/lic.go +++ b/libs/grdp/protocol/lic/lic.go @@ -3,7 +3,7 @@ package lic import ( "io" - "github.com/shadow1ng/fscan/mylib/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/core" ) const ( diff --git a/mylib/grdp/protocol/nla/cssp.go b/libs/grdp/protocol/nla/cssp.go similarity index 98% rename from mylib/grdp/protocol/nla/cssp.go rename to libs/grdp/protocol/nla/cssp.go index 16fd373..8befec4 100644 --- a/mylib/grdp/protocol/nla/cssp.go +++ b/libs/grdp/protocol/nla/cssp.go @@ -3,7 +3,7 @@ package nla import ( "encoding/asn1" - "github.com/shadow1ng/fscan/mylib/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/glog" ) type NegoToken struct { diff --git a/mylib/grdp/protocol/nla/encode.go b/libs/grdp/protocol/nla/encode.go similarity index 94% rename from mylib/grdp/protocol/nla/encode.go rename to libs/grdp/protocol/nla/encode.go index b8009b3..bc85c9d 100644 --- a/mylib/grdp/protocol/nla/encode.go +++ b/libs/grdp/protocol/nla/encode.go @@ -6,7 +6,7 @@ import ( "crypto/rc4" "strings" - "github.com/shadow1ng/fscan/mylib/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/core" "golang.org/x/crypto/md4" ) diff --git a/mylib/grdp/protocol/nla/ntlm.go b/libs/grdp/protocol/nla/ntlm.go similarity index 99% rename from mylib/grdp/protocol/nla/ntlm.go rename to libs/grdp/protocol/nla/ntlm.go index a358d27..ba15172 100644 --- a/mylib/grdp/protocol/nla/ntlm.go +++ b/libs/grdp/protocol/nla/ntlm.go @@ -9,8 +9,8 @@ import ( "time" "github.com/lunixbochs/struc" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/glog" ) const ( diff --git a/mylib/grdp/protocol/pdu/caps.go b/libs/grdp/protocol/pdu/caps.go similarity index 99% rename from mylib/grdp/protocol/pdu/caps.go rename to libs/grdp/protocol/pdu/caps.go index 044eb06..b7589f2 100644 --- a/mylib/grdp/protocol/pdu/caps.go +++ b/libs/grdp/protocol/pdu/caps.go @@ -7,11 +7,11 @@ import ( "fmt" "io" - "github.com/shadow1ng/fscan/mylib/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/glog" "github.com/lunixbochs/struc" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125/gcc" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125/gcc" ) type CapsType uint16 diff --git a/mylib/grdp/protocol/pdu/data.go b/libs/grdp/protocol/pdu/data.go similarity index 99% rename from mylib/grdp/protocol/pdu/data.go rename to libs/grdp/protocol/pdu/data.go index d030db9..ae64df4 100644 --- a/mylib/grdp/protocol/pdu/data.go +++ b/libs/grdp/protocol/pdu/data.go @@ -7,8 +7,8 @@ import ( "io" "github.com/lunixbochs/struc" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/glog" ) const ( diff --git a/mylib/grdp/protocol/pdu/pdu.go b/libs/grdp/protocol/pdu/pdu.go similarity index 98% rename from mylib/grdp/protocol/pdu/pdu.go rename to libs/grdp/protocol/pdu/pdu.go index 8406e69..ed83a0c 100644 --- a/mylib/grdp/protocol/pdu/pdu.go +++ b/libs/grdp/protocol/pdu/pdu.go @@ -3,10 +3,10 @@ package pdu import ( "bytes" "encoding/hex" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/emission" - "github.com/shadow1ng/fscan/mylib/grdp/glog" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125/gcc" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/emission" + "github.com/shadow1ng/fscan/libs/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125/gcc" ) type PDULayer struct { diff --git a/mylib/grdp/protocol/sec/sec.go b/libs/grdp/protocol/sec/sec.go similarity index 98% rename from mylib/grdp/protocol/sec/sec.go rename to libs/grdp/protocol/sec/sec.go index d4aac11..1c0e58e 100644 --- a/mylib/grdp/protocol/sec/sec.go +++ b/libs/grdp/protocol/sec/sec.go @@ -15,14 +15,14 @@ import ( "github.com/lunixbochs/struc" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/nla" + "github.com/shadow1ng/fscan/libs/grdp/protocol/nla" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/emission" - "github.com/shadow1ng/fscan/mylib/grdp/glog" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/lic" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125/gcc" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/emission" + "github.com/shadow1ng/fscan/libs/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/protocol/lic" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125/gcc" ) /** diff --git a/mylib/grdp/protocol/sec/sec_test.go b/libs/grdp/protocol/sec/sec_test.go similarity index 90% rename from mylib/grdp/protocol/sec/sec_test.go rename to libs/grdp/protocol/sec/sec_test.go index 7906688..88cef35 100644 --- a/mylib/grdp/protocol/sec/sec_test.go +++ b/libs/grdp/protocol/sec/sec_test.go @@ -3,8 +3,8 @@ package sec import ( "testing" - "github.com/shadow1ng/fscan/mylib/grdp/glog" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125/gcc" + "github.com/shadow1ng/fscan/libs/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125/gcc" ) func TestGenerateKeysRejectsShortRandoms(t *testing.T) { diff --git a/mylib/grdp/protocol/t125/ber/ber.go b/libs/grdp/protocol/t125/ber/ber.go similarity index 98% rename from mylib/grdp/protocol/t125/ber/ber.go rename to libs/grdp/protocol/t125/ber/ber.go index a92ed85..f98ca9e 100644 --- a/mylib/grdp/protocol/t125/ber/ber.go +++ b/libs/grdp/protocol/t125/ber/ber.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/shadow1ng/fscan/mylib/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/core" ) const ( diff --git a/mylib/grdp/protocol/t125/gcc/gcc.go b/libs/grdp/protocol/t125/gcc/gcc.go similarity index 99% rename from mylib/grdp/protocol/t125/gcc/gcc.go rename to libs/grdp/protocol/t125/gcc/gcc.go index a4ab5ef..58a4fc5 100644 --- a/mylib/grdp/protocol/t125/gcc/gcc.go +++ b/libs/grdp/protocol/t125/gcc/gcc.go @@ -11,11 +11,11 @@ import ( "io" "math/big" - "github.com/shadow1ng/fscan/mylib/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/glog" "github.com/lunixbochs/struc" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125/per" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125/per" ) var t124_02_98_oid = []byte{0, 0, 20, 124, 0, 1} diff --git a/mylib/grdp/protocol/t125/gcc/gcc_test.go b/libs/grdp/protocol/t125/gcc/gcc_test.go similarity index 100% rename from mylib/grdp/protocol/t125/gcc/gcc_test.go rename to libs/grdp/protocol/t125/gcc/gcc_test.go diff --git a/mylib/grdp/protocol/t125/mcs.go b/libs/grdp/protocol/t125/mcs.go similarity index 97% rename from mylib/grdp/protocol/t125/mcs.go rename to libs/grdp/protocol/t125/mcs.go index f8d69b4..646df60 100644 --- a/mylib/grdp/protocol/t125/mcs.go +++ b/libs/grdp/protocol/t125/mcs.go @@ -8,12 +8,12 @@ import ( "io" "reflect" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/emission" - "github.com/shadow1ng/fscan/mylib/grdp/glog" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125/ber" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125/gcc" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/t125/per" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/emission" + "github.com/shadow1ng/fscan/libs/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125/ber" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125/gcc" + "github.com/shadow1ng/fscan/libs/grdp/protocol/t125/per" ) // take idea from https://github.com/Madnikulin50/gordp diff --git a/mylib/grdp/protocol/t125/mcs.go.bak b/libs/grdp/protocol/t125/mcs.go.bak similarity index 100% rename from mylib/grdp/protocol/t125/mcs.go.bak rename to libs/grdp/protocol/t125/mcs.go.bak diff --git a/mylib/grdp/protocol/t125/per/per.go b/libs/grdp/protocol/t125/per/per.go similarity index 97% rename from mylib/grdp/protocol/t125/per/per.go rename to libs/grdp/protocol/t125/per/per.go index 40c1ee3..b4cc67b 100644 --- a/mylib/grdp/protocol/t125/per/per.go +++ b/libs/grdp/protocol/t125/per/per.go @@ -4,9 +4,9 @@ import ( "bytes" "io" - "github.com/shadow1ng/fscan/mylib/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/glog" - "github.com/shadow1ng/fscan/mylib/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/core" ) func ReadEnumerates(r io.Reader) (uint8, error) { diff --git a/mylib/grdp/protocol/tpkt/tpkt.go b/libs/grdp/protocol/tpkt/tpkt.go similarity index 98% rename from mylib/grdp/protocol/tpkt/tpkt.go rename to libs/grdp/protocol/tpkt/tpkt.go index 34e9569..51d53b8 100644 --- a/mylib/grdp/protocol/tpkt/tpkt.go +++ b/libs/grdp/protocol/tpkt/tpkt.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/emission" - "github.com/shadow1ng/fscan/mylib/grdp/glog" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/nla" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/emission" + "github.com/shadow1ng/fscan/libs/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/protocol/nla" ) // take idea from https://github.com/Madnikulin50/gordp diff --git a/mylib/grdp/protocol/x224/x224.go b/libs/grdp/protocol/x224/x224.go similarity index 98% rename from mylib/grdp/protocol/x224/x224.go rename to libs/grdp/protocol/x224/x224.go index 6b58f26..05f5215 100644 --- a/mylib/grdp/protocol/x224/x224.go +++ b/libs/grdp/protocol/x224/x224.go @@ -6,12 +6,12 @@ import ( "errors" "fmt" - "github.com/shadow1ng/fscan/mylib/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/glog" "github.com/lunixbochs/struc" - "github.com/shadow1ng/fscan/mylib/grdp/core" - "github.com/shadow1ng/fscan/mylib/grdp/emission" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/tpkt" + "github.com/shadow1ng/fscan/libs/grdp/core" + "github.com/shadow1ng/fscan/libs/grdp/emission" + "github.com/shadow1ng/fscan/libs/grdp/protocol/tpkt" ) // take idea from https://github.com/Madnikulin50/gordp diff --git a/plugins/services/rdp.go b/plugins/services/rdp.go index dcabb3a..79065a6 100644 --- a/plugins/services/rdp.go +++ b/plugins/services/rdp.go @@ -9,9 +9,9 @@ import ( "github.com/shadow1ng/fscan/common" "github.com/shadow1ng/fscan/common/i18n" - "github.com/shadow1ng/fscan/mylib/grdp/glog" - "github.com/shadow1ng/fscan/mylib/grdp/login" - "github.com/shadow1ng/fscan/mylib/grdp/protocol/x224" + "github.com/shadow1ng/fscan/libs/grdp/glog" + "github.com/shadow1ng/fscan/libs/grdp/login" + "github.com/shadow1ng/fscan/libs/grdp/protocol/x224" "github.com/shadow1ng/fscan/plugins" )