Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@
}
},
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {
"installZsh": true,
"configureZshAsDefaultShell": true,
"installOhMyZsh": true,
"installOhMyZshConfig": true,
"username": "vscode",
"userUid": "1001",
"userGid": "automatic"
},
"ghcr.io/devcontainers/features/go:1": {
"version": "1.23"
},
Expand All @@ -31,7 +22,6 @@
"ghcr.io/devcontainers/features/node:1": {
"version": "lts"
},
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}
},
"customizations": {
"vscode": {
Expand All @@ -56,18 +46,13 @@
},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"DavidAnson.vscode-markdownlint",
"golang.Go",
"graphql.vscode-graphql",
"GraphQL.vscode-graphql-syntax",
"HashiCorp.terraform",
"rust-lang.rust-analyzer",
"sourcegraph.sourcegraph"
]
}
},
"appPort": [
"127.0.0.1:80:80"
],
"remoteUser": "vscode"
}
16 changes: 8 additions & 8 deletions .github/workflows/docker-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
lfs: 'true'
- name: Replace lfs references with files
run: git lfs pull
- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}


- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
spellshift/tavern
Expand All @@ -44,7 +44,7 @@ jobs:
type=sha,format=long

- name: Build and push Dockerhub image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
file: ./docker/tavern.Dockerfile
context: .
Expand All @@ -54,15 +54,15 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.GHCR_REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta_ghcr
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ env.GHCR_REGISTRY }}/${{ env.GHCR_IMAGE_NAME }}
Expand All @@ -72,7 +72,7 @@ jobs:
type=sha,format=long

- name: Build and push GHCR image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
file: ./docker/tavern.Dockerfile
context: .
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,33 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
lfs: 'true'
- name: Replace lfs references with files
run: git lfs pull
- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.GHCR_REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
spellshift/tavern
${{ env.GHCR_REGISTRY }}/${{ env.GHCR_IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
file: ./docker/tavern.Dockerfile
context: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
lfs: true
- name: Setup Pages
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
name: 🚀 [Linux] Tavern
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: ⚡ Setup Golang
uses: actions/setup-go@v3
uses: actions/setup-go@v6
with:
go-version-file: go.mod
cache: true
Expand All @@ -50,7 +50,7 @@ jobs:
name: 🚀 [Linux] Imix
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: 🛠️ Setup Rust Toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
name: 🚀 [MacOS] Imix
runs-on: macOS-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: 🛠️ Setup Rust Toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
name: 🚀 [Windows] Imix
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: 🛠️ Setup Rust Toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
name: 🚀 [Linux] Golem
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: 🛠️ Setup Rust Toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
name: 🚀 [MacOS] Golem
runs-on: macOS-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: 🛠️ Setup Rust Toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
name: 🚀 [Windows] Golem
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: 🛠️ Setup Rust Toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
os:
- ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: ⚡ Setup Golang
uses: actions/setup-go@v3
uses: actions/setup-go@v6
with:
go-version-file: go.mod
cache: true
Expand All @@ -29,7 +29,9 @@ jobs:
- name: 🔎 Test
run: go test -v -race -coverprofile='coverage.out' -covermode=atomic ./tavern/...
- name: 📶 Upload Coverage Results
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
implants:
runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand All @@ -42,7 +44,7 @@ jobs:
- macOS-latest
- windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- if: matrix.os == 'windows-latest'
run: start-process -filepath powershell -ArgumentList '/c','Set-MpPreference -DisableRealtimeMonitoring $true' -verb RunAs
name: 👾 Disable defender
Expand Down Expand Up @@ -82,4 +84,6 @@ jobs:
cargo fmt --check &&
cargo llvm-cov nextest --lcov --output-path lcov.info
- name: 📶 Upload Coverage Results
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion bin/getpubkey.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set +e
keep_trying() {
DOMAIN="$1"
for (( i=1 ; i<=180; i++)); do
RES=$(curl -q $DOMAIN/status 2>/dev/null)
RES=$(curl -q --fail $DOMAIN/status 2>/dev/null)
if [[ $? -eq 0 && -n $RES ]]; then
echo $RES
exit
Expand Down
1 change: 1 addition & 0 deletions docs/_docs/user-guide/imix.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Imix has run-time configuration, that may be specified using environment variabl
| Env Var | Description | Default | Required |
| ------- | ----------- | ------- | -------- |
| IMIX_BEACON_ID | The identifier to be used during callback (must be globally unique) | Random UUIDv4 | No |
| IMIX_LOG | Log message level for debug builds. See below for more information. | INFO | No |

## Logging

Expand Down
1 change: 1 addition & 0 deletions implants/lib/pb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ whoami = { workspace = true }
[build-dependencies]
tonic-build = { workspace = true, features = ["prost"] }
which = { workspace = true }
home = "=0.5.11"
Loading