Skip to content

Commit

Permalink
Sync dependent artifacts (#3334)
Browse files Browse the repository at this point in the history
  • Loading branch information
scudette authored Mar 10, 2024
1 parent d0c7c96 commit bb90be3
Show file tree
Hide file tree
Showing 9 changed files with 1,948 additions and 1,897 deletions.
6 changes: 3 additions & 3 deletions artifacts/definitions/Generic/Collectors/SQLECmd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ sources:
- name: Chromium Browser Downloads
query: |
LET IdentifyQuery = '''SELECT count(*) FROM sqlite_master WHERE type='table' AND (name='urls' OR name='visits' OR name='downloads' OR name='segments' OR name='typed_url_sync_metadata');'''
LET IdentifyQuery = '''SELECT count(*) FROM sqlite_master WHERE type='table' AND (name='urls' OR name='visits' OR name='downloads' OR name='segments' OR name='keyword_search_terms');'''
LET IdentifyValue = 5
LET SQLQuery = '''SELECT
downloads.id AS ID,
Expand Down Expand Up @@ -656,7 +656,7 @@ sources:
- name: Chromium Browser History
query: |
LET IdentifyQuery = '''SELECT count(*) FROM sqlite_master WHERE type='table' AND (name='urls' OR name='visits' OR name='downloads' OR name='segments' OR name='typed_url_sync_metadata');'''
LET IdentifyQuery = '''SELECT count(*) FROM sqlite_master WHERE type='table' AND (name='urls' OR name='visits' OR name='downloads' OR name='segments' OR name='keyword_search_terms');'''
LET IdentifyValue = 5
LET SQLQuery = '''SELECT
urls.id AS ID,
Expand Down Expand Up @@ -689,7 +689,7 @@ sources:
- name: Chromium Browser Keyword Searches
query: |
LET IdentifyQuery = '''SELECT count(*) FROM sqlite_master WHERE type='table' AND (name='urls' OR name='visits' OR name='downloads' OR name='segments' OR name='typed_url_sync_metadata');'''
LET IdentifyQuery = '''SELECT count(*) FROM sqlite_master WHERE type='table' AND (name='urls' OR name='visits' OR name='downloads' OR name='segments' OR name='keyword_search_terms');'''
LET IdentifyValue = 5
LET SQLQuery = '''SELECT
keyword_search_terms.keyword_id AS KeywordID,
Expand Down
1,815 changes: 920 additions & 895 deletions artifacts/definitions/Linux/KapeFiles/CollectFromDirectory.yaml

Large diffs are not rendered by default.

1,815 changes: 920 additions & 895 deletions artifacts/definitions/Windows/KapeFiles/Targets.yaml

Large diffs are not rendered by default.

182 changes: 91 additions & 91 deletions gui/velociraptor/package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions gui/velociraptor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
"private": true,
"type": "module",
"dependencies": {
"@babel/core": "^7.23.7",
"@babel/core": "^7.23.9",
"@babel/plugin-syntax-flow": "^7.23.3",
"@babel/plugin-transform-react-jsx": "^7.23.4",
"@babel/runtime": "^7.23.8",
"@babel/runtime": "^7.23.9",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "0.2.0",
"@popperjs/core": "^2.11.8",
"ace-builds": "1.32.3",
"axios": ">=1.6.6",
"axios": ">=1.6.7",
"ace-builds": "1.32.4",
"axios-retry": "3.9.1",
"bootstrap": "^4.6.2",
"classnames": "^2.5.1",
Expand Down Expand Up @@ -60,7 +60,7 @@
"react-split-grid": "^1.0.4",
"react-split-pane": "^0.1.92",
"react-step-wizard": "^5.3.11",
"recharts": "^2.10.4",
"recharts": "^2.11.0",
"styled-components": "^5.3.11",
"svgo": "2.8.0",
"url-parse": "^1.5.10",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class OfflineCollectorParameters extends React.Component {
<Col sm="8">
<Form.Control
as="textarea"
placeholder={T("Public Key/Certificate To Encrypt With. If X509, Defaults To Frontend Cert")}
placeholder={T("Public Key/Certificate To Encrypt With. If empty, defaults To Frontend Cert")}
spellCheck="false"
value={this.props.parameters.encryption_args.public_key}
onChange={e => {
Expand Down
1 change: 0 additions & 1 deletion gui/velociraptor/src/components/i8n/vi.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,6 @@ const Vietnamese = {
"Properties": "Thuộc tính",
"Public": "Công khai",
"Public Key/Cert": "Public Key/Cert",
"Public Key/Certificate To Encrypt With. If X509, Defaults To Frontend Cert": "Public Key/Certificate để mã hóa. Nếu X509, Mặc định là Frontend Cert",
"Quarantine Host": "Cách ly host",
"Quarantine Message": "Thông báo cách ly",
"Quarantine host": "Cách ly host",
Expand Down
8 changes: 4 additions & 4 deletions services/ddclient/cloudflare.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,23 @@ hostname under that domain, e.g. "velociraptor.example.com"
Using this information you can now create the dyndns configuration:
```yaml
Frontend:
....
dyn_dns:
type: cloudflare
api_token: XXXYYYZZZ
ZoneName: example.com
zone_name: example.com
```
Make sure the Frontend.Hostname field is set to the correct hostname
to update - for example
```yaml
Frontend:
Hostname: velociraptor.example.com
hostname: velociraptor.example.com
```
This is the hostname that will be updated.
*/

import (
Expand Down Expand Up @@ -208,7 +209,6 @@ func (self CloudflareUpdater) UpdateDDNSRecord(

record_id, err := self.getRecordId(zone_id)
if err != nil {
// TODO - if the record is missing we need to add it.
return err
}

Expand Down
6 changes: 4 additions & 2 deletions services/ddclient/noip.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ package ddclient
Sample config:
```yaml
Frontend:
...
dyn_dns:
type: noip
ddns_username: USER123
ddns_password: XXXYYYZZZ
```
This provider also supports other formats for the update URL so it can
be used with other dyndns providers. The update_url is a Golang
template which will be expanded into the full URL.
be used with other dyndns providers. The `update_url` field is a
Golang template which will be expanded into the full URL.
For noip.com the template defaults to
https://dynupdate.no-ip.com/nic/update?hostname={{.Hostname}}&myip={{.IP}}
Expand Down

0 comments on commit bb90be3

Please sign in to comment.