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

v2.8.0 into main #95

Merged
merged 7 commits into from
May 3, 2024
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
5 changes: 2 additions & 3 deletions .github/.dependabot.yml → .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: 2
updates:
- package_manager: "npm"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "sunday"
target-branch: "dev"
target-branch: "private-main"
4 changes: 2 additions & 2 deletions .github/workflows/lint-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
cache: "yarn"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: "recursive"
ref: private-main
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-private-start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set target branch
run: echo "TARGET_BRANCH=private-main" >> $GITHUB_ENV
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ env.TARGET_BRANCH }}
submodules: "recursive"
Expand All @@ -30,7 +30,7 @@ jobs:
run: |
git config user.name "GitHub Actions"
git config user.email [email protected]
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
- name: Change version number
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Push new branch
run: git push origin ${{ env.RELEASE_BRANCH }}
- name: Create pull request into ${{ env.TARGET_BRANCH }}
uses: thomaseizinger/create-pull-request@1.0.0
uses: thomaseizinger/create-pull-request@1.3.1
with:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
head: ${{ env.RELEASE_BRANCH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-private-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.base_ref }}
fetch-depth: 0
Expand All @@ -21,7 +21,7 @@ jobs:
run: |
git config user.name "GitHub Actions"
git config user.email [email protected]
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
- name: Set application version as variable
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-public-start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out sponsor repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: "BC-Security/Starkiller-Sponsors"
ref: ${{ inputs.sponsorTag }}
Expand All @@ -29,7 +29,7 @@ jobs:
run: |
git config user.name "GitHub Actions"
git config user.email [email protected]
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
- name: Get app version
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Push new branch
run: git push public ${{ env.RELEASE_BRANCH }}
- name: Create pull request into main
uses: thomaseizinger/create-pull-request@1.0.0
uses: thomaseizinger/create-pull-request@1.3.1
with:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
head: ${{ env.RELEASE_BRANCH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-public-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Initialize mandatory git config
Expand All @@ -25,7 +25,7 @@ jobs:
tags=$(echo "$tags" | grep -v -E "beta|alpha|rc|RC")
latest_tag=$(echo "$tags" | head -n 1)
echo "LATEST_TAG=$latest_tag" >> $GITHUB_ENV
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
cache: "yarn"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-sponsor-kali-start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
run: |
echo "TARGET_BRANCH=sponsors-main" >> $GITHUB_ENV
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: sponsors-main
fetch-depth: 0
Expand All @@ -21,7 +21,7 @@ jobs:
run: |
git config user.name "GitHub Actions"
git config user.email [email protected]
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
- name: Get app version
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Push new branch
run: git push origin ${{ env.RELEASE_BRANCH }}
- name: Create pull request into ${{ env.TARGET_BRANCH }}
uses: thomaseizinger/create-pull-request@1.0.0
uses: thomaseizinger/create-pull-request@1.3.1
with:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
head: ${{ env.RELEASE_BRANCH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-sponsor-kali-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
run: |
echo "TAG_NAME=$(echo ${{ github.head_ref }} | sed 's/release\///')" >> $GITHUB_ENV
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.base_ref }}
token: ${{ secrets.RELEASE_TOKEN }}
- name: Initialize mandatory git config
run: |
git config user.name "GitHub Actions"
git config user.email [email protected]
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
cache: "yarn"
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.8.0] - 2024-04-08

### Added

- Added completed, error, continuous statuses to taskings

## [2.7.3] - 2024-02-22

### Added
Expand Down Expand Up @@ -361,7 +367,9 @@ Including but not limited to:

- Initial Release

[Unreleased]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.3...HEAD
[Unreleased]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.8.0...HEAD

[2.8.0]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.3...v2.8.0

[2.7.3]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.2...v2.7.3

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "starkiller",
"version": "2.7.3",
"version": "2.8.0",
"private": true,
"scripts": {
"dev": "vite",
Expand Down
11 changes: 10 additions & 1 deletion src/components/agents/AgentTasksTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
show-expand
@update:options="handleOptionsChange"
>
<template #expanded-item="{ headers, item }">

Check warning on line 23 in src/components/agents/AgentTasksTable.vue

View workflow job for this annotation

GitHub Actions / lint

Variable 'headers' is already declared in the upper scope
<td :colspan="headers.length">
<div>
<div
Expand Down Expand Up @@ -108,7 +108,7 @@
<!-- TODO Option for original output -->
<div
v-if="expandedTasks[item.uniqueId].htmlOutput"
v-html="expandedTasks[item.uniqueId].htmlOutput"

Check warning on line 111 in src/components/agents/AgentTasksTable.vue

View workflow job for this annotation

GitHub Actions / lint

'v-html' directive can lead to XSS attack
/>
<div v-else>
{{ addBlankLines(item.output) }}
Expand All @@ -118,12 +118,21 @@
</td>
</template>
<template #item.status="{ item }">
<v-icon v-if="item.status === 'pulled'" color="green" small>
<v-icon v-if="item.status === 'pulled'" color="blue" small>
fa-check-square
</v-icon>
<v-icon v-else-if="item.status === 'queued'" color="orange" small>
fa-clock
</v-icon>
<v-icon v-else-if="item.status === 'completed'" color="green" small>
fa-check-circle
</v-icon>
<v-icon v-else-if="item.status === 'error'" color="red" small>
fa-times-circle
</v-icon>
<v-icon v-else-if="item.status === 'continuous'" color="purple" small>
fa-infinity
</v-icon>
</template>
<template v-if="!agent" #item.agent_id="{ item }">
<router-link
Expand Down
16 changes: 15 additions & 1 deletion src/components/plugins/PluginTasksTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
show-expand
@update:options="handleOptionsChange"
>
<template #expanded-item="{ headers, item }">

Check warning on line 23 in src/components/plugins/PluginTasksTable.vue

View workflow job for this annotation

GitHub Actions / lint

Variable 'headers' is already declared in the upper scope
<td :colspan="headers.length">
<div>
<div
Expand Down Expand Up @@ -108,7 +108,7 @@
<!-- TODO Option for original output -->
<div
v-if="expandedTasks[item.uniqueId].htmlOutput"
v-html="expandedTasks[item.uniqueId].htmlOutput"

Check warning on line 111 in src/components/plugins/PluginTasksTable.vue

View workflow job for this annotation

GitHub Actions / lint

'v-html' directive can lead to XSS attack
/>
<div v-else>addBlankLines(item.output)</div>
</div>
Expand All @@ -116,7 +116,21 @@
</td>
</template>
<template #item.status="{ item }">
{{ item.status }}
<v-icon v-if="item.status === 'started'" color="blue" small>
fa-check-square
</v-icon>
<v-icon v-else-if="item.status === 'queued'" color="orange" small>
fa-clock
</v-icon>
<v-icon v-else-if="item.status === 'completed'" color="green" small>
fa-check-circle
</v-icon>
<v-icon v-else-if="item.status === 'error'" color="red" small>
fa-times-circle
</v-icon>
<v-icon v-else-if="item.status === 'continuous'" color="purple" small>
fa-infinity
</v-icon>
</template>
<template #item.input="{ item }">
<span>{{ truncateMessage(item.input) }}</span>
Expand Down
Loading