diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..09317e07 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 10 + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.gitignore b/.gitignore index d54eae15..6a9a46bd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ rpc/y.out develop/.vagrant examples/testing test/ +vendor/ .vimrc diff --git a/Makefile b/Makefile index 06b71d3d..fbd1a171 100644 --- a/Makefile +++ b/Makefile @@ -159,3 +159,7 @@ all: .PHONY: test test: go test ./msrpc/... + +.PHONY: gen +gen: + go generate ./msrpc/... diff --git a/go.mod b/go.mod index f40b7ec9..e88afa42 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,11 @@ module github.com/oiweiwei/go-msrpc +ignore ./test + go 1.25.0 require ( + github.com/PuerkitoBio/goquery v1.12.0 github.com/go-xmlfmt/xmlfmt v1.1.2 github.com/jcmturner/gofork v1.7.6 github.com/jcmturner/gokrb5/v8 v8.4.4 @@ -15,9 +18,11 @@ require ( github.com/stretchr/testify v1.11.1 golang.org/x/crypto v0.49.0 golang.org/x/text v0.36.0 + gopkg.in/yaml.v3 v3.0.1 ) require ( + github.com/andybalholm/cascadia v1.3.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/geoffgarside/ber v1.1.0 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -34,5 +39,4 @@ require ( golang.org/x/sync v0.20.0 // indirect golang.org/x/sys v0.42.0 // indirect golang.org/x/tools v0.43.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 083baf27..7ec8e97b 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,7 @@ +github.com/PuerkitoBio/goquery v1.12.0 h1:pAcL4g3WRXekcB9AU/y1mbKez2dbY2AajVhtkO8RIBo= +github.com/PuerkitoBio/goquery v1.12.0/go.mod h1:802ej+gV2y7bbIhOIoPY5sT183ZW0YFofScC4q/hIpQ= +github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= +github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -66,9 +70,17 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI= golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -77,10 +89,20 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -91,21 +113,39 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/msrpc/ad/ad.go b/msrpc/ad/ad.go index fa742b88..262fd819 100644 --- a/msrpc/ad/ad.go +++ b/msrpc/ad/ad.go @@ -1,3 +1,4 @@ +//go:generate go run gen/gen.go -o attributes.go package ad import ( diff --git a/msrpc/ad/attributes.go b/msrpc/ad/attributes.go index 8e0e9f3b..5637f7ea 100644 --- a/msrpc/ad/attributes.go +++ b/msrpc/ad/attributes.go @@ -1,3 +1,4 @@ +// Code generated by github.com/oiweiwei/go-msrpc/msrpc/ad/gen.go DO NOT EDIT. package ad import ( @@ -11368,4 +11369,3 @@ var attributes = map[string]Attr{ Description: "Used to distinguish between objects when a distinguished name has been reused. This is a different attribute type from both the uid and uniqueIdentifier types.", }, } - diff --git a/msrpc/ad/gen.go b/msrpc/ad/gen/gen.go similarity index 95% rename from msrpc/ad/gen.go rename to msrpc/ad/gen/gen.go index 6d1d7e19..3a1b3278 100644 --- a/msrpc/ad/gen.go +++ b/msrpc/ad/gen/gen.go @@ -1,5 +1,3 @@ -//go:build ignore - package main import ( @@ -26,6 +24,7 @@ var ( u string cache string dump bool + out string backoff time.Duration mask = make(map[string]struct{}) ) @@ -37,6 +36,7 @@ func init() { flag.DurationVar(&backoff, "backoff", 500*time.Millisecond, "the backoff factor") var attrs string flag.StringVar(&attrs, "attrs", "", "the attributes to dump") + flag.StringVar(&out, "o", "attributes.go", "the output file") flag.Parse() @@ -145,6 +145,7 @@ func main() { p := &P{} + p.P("// Code generated by github.com/oiweiwei/go-msrpc/msrpc/ad/gen.go DO NOT EDIT.") p.P("package", "ad") p.P() @@ -180,7 +181,14 @@ func main() { os.Exit(1) } - fmt.Fprintln(os.Stdout, string(b)) + if out != "" { + if err := os.WriteFile(out, b, 0644); err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } + } else { + fmt.Fprintln(os.Stdout, string(b)) + } } diff --git a/msrpc/erref/gen.go b/msrpc/erref/gen/gen.go similarity index 97% rename from msrpc/erref/gen.go rename to msrpc/erref/gen/gen.go index 5eb1ef21..e1e102ce 100644 --- a/msrpc/erref/gen.go +++ b/msrpc/erref/gen/gen.go @@ -1,5 +1,3 @@ -//go:build ignore - package main import ( @@ -156,6 +154,7 @@ func main() { pp := &P{} p := pp.P + p("// Code generated by github.com/oiweiwei/go-msrpc/msrpc/erref/gen/gen.go DO NOT EDIT.") p("package", pkg) p() diff --git a/msrpc/erref/hresult/hresult.go b/msrpc/erref/hresult/hresult.go index d4768389..7f6fcaf7 100644 --- a/msrpc/erref/hresult/hresult.go +++ b/msrpc/erref/hresult/hresult.go @@ -1,4 +1,4 @@ -//go:generate go run ../gen.go -o hresult_errors.go -pkg hresult -url https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/705fb797-2175-4a90-b5a3-3918024b10b8 -url https://learn.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/platform-apis/ms775145(v=vs.85) -url https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-csra/f46c3c08-6566-407e-a93e-b0f5e91010f7 +//go:generate go run ../gen/gen.go -o hresult_errors.go -pkg hresult -url https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/705fb797-2175-4a90-b5a3-3918024b10b8 -url https://learn.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/platform-apis/ms775145(v=vs.85) -url https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-csra/f46c3c08-6566-407e-a93e-b0f5e91010f7 package hresult import ( diff --git a/msrpc/erref/hresult/hresult_errors.go b/msrpc/erref/hresult/hresult_errors.go index c988f476..6bfc2505 100644 --- a/msrpc/erref/hresult/hresult_errors.go +++ b/msrpc/erref/hresult/hresult_errors.go @@ -1,3 +1,4 @@ +// Code generated by github.com/oiweiwei/go-msrpc/msrpc/erref/gen/gen.go DO NOT EDIT. package hresult var ( diff --git a/msrpc/erref/ntstatus/ntstatus.go b/msrpc/erref/ntstatus/ntstatus.go index b4fd79ec..8dbc04c2 100644 --- a/msrpc/erref/ntstatus/ntstatus.go +++ b/msrpc/erref/ntstatus/ntstatus.go @@ -1,4 +1,4 @@ -//go:generate go run ../gen.go -o ntstatus_errors.go -pkg ntstatus -url https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/596a1078-e883-4972-9bbc-49e60bebca55 +//go:generate go run ../gen/gen.go -o ntstatus_errors.go -pkg ntstatus -url https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/596a1078-e883-4972-9bbc-49e60bebca55 package ntstatus import ( diff --git a/msrpc/erref/ntstatus/ntstatus_errors.go b/msrpc/erref/ntstatus/ntstatus_errors.go index 30e38491..a2fee4e0 100644 --- a/msrpc/erref/ntstatus/ntstatus_errors.go +++ b/msrpc/erref/ntstatus/ntstatus_errors.go @@ -1,3 +1,4 @@ +// Code generated by github.com/oiweiwei/go-msrpc/msrpc/erref/gen/gen.go DO NOT EDIT. package ntstatus var ( diff --git a/msrpc/erref/win32/win32.go b/msrpc/erref/win32/win32.go index 8f72b5b3..2bc7d81e 100644 --- a/msrpc/erref/win32/win32.go +++ b/msrpc/erref/win32/win32.go @@ -1,4 +1,4 @@ -//go:generate go run ../gen.go -o win32_errors.go -pkg win32 -url https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/18d8fbe8-a967-4f1c-ae50-99ca8e491d2d +//go:generate go run ../gen/gen.go -o win32_errors.go -pkg win32 -url https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/18d8fbe8-a967-4f1c-ae50-99ca8e491d2d package win32 import ( diff --git a/msrpc/erref/win32/win32_errors.go b/msrpc/erref/win32/win32_errors.go index c6cf780a..bd194d58 100644 --- a/msrpc/erref/win32/win32_errors.go +++ b/msrpc/erref/win32/win32_errors.go @@ -1,3 +1,4 @@ +// Code generated by github.com/oiweiwei/go-msrpc/msrpc/erref/gen/gen.go DO NOT EDIT. package win32 var (