Skip to content

Commit

Permalink
[feature] Import Tomes from git (#603)
Browse files Browse the repository at this point in the history
  • Loading branch information
KCarretto authored Feb 18, 2024
1 parent e1ca31b commit a4671b3
Show file tree
Hide file tree
Showing 19 changed files with 738 additions and 40 deletions.
3 changes: 3 additions & 0 deletions bin/embedded_files_test/exec_script/metadata.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: exec_script
author: hulto
description: Copies a script and executes it.
3 changes: 3 additions & 0 deletions bin/embedded_files_test/print/metadata.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: print
author: hulto
description: It just prints.
28 changes: 24 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,37 @@ require (
github.com/hashicorp/go-multierror v1.1.1
github.com/mattn/go-sqlite3 v1.14.16
github.com/prometheus/client_golang v1.18.0
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
github.com/urfave/cli v1.22.5
github.com/vektah/gqlparser/v2 v2.5.10
golang.org/x/crypto v0.14.0
golang.org/x/net v0.17.0
golang.org/x/crypto v0.16.0
golang.org/x/net v0.19.0
golang.org/x/oauth2 v0.12.0
golang.org/x/sync v0.4.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.32.0
gopkg.in/yaml.v3 v3.0.1
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)

require (
ariga.io/atlas v0.14.2 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
Expand All @@ -36,6 +55,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-git/go-git/v5 v5.11.0
github.com/go-openapi/inflect v0.19.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
Expand All @@ -57,7 +77,7 @@ require (
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
Expand Down
119 changes: 105 additions & 14 deletions go.sum

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion implants/lib/eldritch/src/assets/list_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ mod tests {
"exec_script/hello_world.bat",
"exec_script/hello_world.sh",
"exec_script/main.eldritch",
"print/main.eldritch"
"exec_script/metadata.yml",
"print/main.eldritch",
"print/metadata.yml",
]
);

Expand Down
2 changes: 1 addition & 1 deletion tavern/internal/c2/c2test/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func New(t *testing.T) (c2pb.C2Client, *ent.Client, func()) {
baseSrv.Stop()
assert.NoError(t, graph.Close())
if err := <-grpcErrCh; err != nil && !errors.Is(err, grpc.ErrServerStopped) {
t.Fatalf("failed to serve grpc")
t.Fatalf("failed to serve grpc: %v", err)
}
}
}
43 changes: 43 additions & 0 deletions tavern/internal/graphql/generated/inputs.generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

123 changes: 123 additions & 0 deletions tavern/internal/graphql/generated/mutation.generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 35 additions & 10 deletions tavern/internal/graphql/generated/root_.generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions tavern/internal/graphql/models/gqlgen_models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a4671b3

Please sign in to comment.