Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Block collections in locked down servers #2668

Merged
merged 1 commit into from
May 7, 2023
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
24 changes: 12 additions & 12 deletions artifacts/definitions/Server/Internal/ToolDependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ description: |

tools:
- name: VelociraptorWindows
github_project: Velocidex/velociraptor
github_asset_regex: windows-amd64.exe
url: https://github.com/Velocidex/velociraptor/releases/download/v0.6.9-rc1/velociraptor-v0.6.9-rc1-windows-amd64.exe
serve_locally: true
version: 0.6.9-rc1

- name: VelociraptorWindows_x86
github_project: Velocidex/velociraptor
github_asset_regex: windows-386.exe
url: https://github.com/Velocidex/velociraptor/releases/download/v0.6.9-rc1/velociraptor-v0.6.9-rc1-windows-386.exe
serve_locally: true
version: 0.6.9-rc1

- name: VelociraptorLinux
github_project: Velocidex/velociraptor
github_asset_regex: linux-amd64-musl
url: https://github.com/Velocidex/velociraptor/releases/download/v0.6.9-rc1/velociraptor-v0.6.9-rc1-linux-amd64-musl
serve_locally: true
version: 0.6.9-rc1

- name: VelociraptorDarwin
github_project: Velocidex/velociraptor
github_asset_regex: darwin-amd64
url: https://github.com/Velocidex/velociraptor/releases/download/v0.6.9-rc1/velociraptor-v0.6.9-rc1-darwin-amd64
serve_locally: true
version: 0.6.9-rc1

- name: VelociraptorWindowsMSI
github_project: Velocidex/velociraptor
github_asset_regex: windows-amd64.msi
url: https://github.com/Velocidex/velociraptor/releases/download/v0.6.9-rc1/velociraptor-v0.6.9-rc1-windows-amd64.msi
serve_locally: true
version: 0.6.9-rc1

- name: VelociraptorWindows_x86MSI
github_project: Velocidex/velociraptor
github_asset_regex: windows-386.msi
url: https://github.com/Velocidex/velociraptor/releases/download/v0.6.9-rc1/velociraptor-v0.6.9-rc1-windows-386.msi
serve_locally: true
version: 0.6.9-rc1
2 changes: 2 additions & 0 deletions gui/velociraptor/src/components/artifacts/artifacts.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

.artifact-search-table button {
cursor: pointer;
width: 100%;
text-align: left;
}

.artifact-search-table button:hover {
Expand Down
2 changes: 1 addition & 1 deletion gui/velociraptor/src/components/core/paged-table.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ class VeloPagedTable extends Component {
}}
>
<FontAwesomeIcon icon="filter"/>
{ filter_column == column.text && filter }
{ filter_column == column.text && !edit_filter_visible && filter }
</Button>
{ edit_filter_visible &&
<Form.Control
Expand Down
3 changes: 3 additions & 0 deletions services/sanity/lockdown.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ func (self SanityChecks) CheckForLockdown(
lockdown_token := &acl_proto.ApiClientACL{
ArtifactWriter: true,
ServerArtifactWriter: true,
CollectClient: true,
CollectServer: true,
StartHunt: true,
Execve: true,
ServerAdmin: true,
FilesystemWrite: true,
Expand Down
2 changes: 1 addition & 1 deletion vql/tools/collector/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func AddSpecProtobuf(
artifact_definitions, pres := repository.Get(ctx, config_obj, name)
if !pres {
// Artifact not known
return fmt.Errorf(`Parameter 'args' refers to an unknown artifact (%v). The 'args' parameter should be of the form {"Custom.Artifact.Name":{"arg":"value"}}`, name)
return fmt.Errorf(`Parameter refers to an unknown artifact (%v). The parameter should be of the form {"Custom.Artifact.Name":{"arg":"value"}}`, name)
}

// Check that we are allowed to collect this artifact
Expand Down