-
Notifications
You must be signed in to change notification settings - Fork 0
Merge 1.4.1 to main #16
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+823 Bytes
(100%)
docsource/images/Fortigate-advanced-store-type-dialog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.22 KB
(110%)
docsource/images/Fortigate-custom-fields-store-type-dialog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Creates all 1 store types via the Keyfactor Command REST API using curl. | ||
| # | ||
| # Authentication (first matching method is used): | ||
| # OAuth access token: KEYFACTOR_AUTH_ACCESS_TOKEN | ||
| # OAuth client creds: KEYFACTOR_AUTH_CLIENT_ID + KEYFACTOR_AUTH_CLIENT_SECRET | ||
| # + KEYFACTOR_AUTH_TOKEN_URL | ||
| # Basic auth (AD): KEYFACTOR_USERNAME + KEYFACTOR_PASSWORD + KEYFACTOR_DOMAIN | ||
| # | ||
| # Always required: | ||
| # KEYFACTOR_HOSTNAME Command hostname (e.g. my-command.example.com) | ||
| # | ||
| # Auto-generated by doctool generate-store-type-scripts — do not edit by hand. | ||
|
|
||
| if [ -z "${KEYFACTOR_HOSTNAME}" ]; then | ||
| echo "ERROR: KEYFACTOR_HOSTNAME is required" | ||
| exit 1 | ||
| fi | ||
|
|
||
| BASE_URL="https://${KEYFACTOR_HOSTNAME}/keyfactorapi" | ||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # Resolve auth | ||
| # --------------------------------------------------------------------------- | ||
| if [ -n "${KEYFACTOR_AUTH_ACCESS_TOKEN}" ]; then | ||
| BEARER_TOKEN="${KEYFACTOR_AUTH_ACCESS_TOKEN}" | ||
| elif [ -n "${KEYFACTOR_AUTH_CLIENT_ID}" ] && [ -n "${KEYFACTOR_AUTH_CLIENT_SECRET}" ] && [ -n "${KEYFACTOR_AUTH_TOKEN_URL}" ]; then | ||
| echo "Fetching OAuth token..." | ||
| BEARER_TOKEN=$(curl -s -X POST "${KEYFACTOR_AUTH_TOKEN_URL}" \ | ||
| -H "Content-Type: application/x-www-form-urlencoded" \ | ||
| --data-urlencode "grant_type=client_credentials" \ | ||
| --data-urlencode "client_id=${KEYFACTOR_AUTH_CLIENT_ID}" \ | ||
| --data-urlencode "client_secret=${KEYFACTOR_AUTH_CLIENT_SECRET}" | jq -r '.access_token') | ||
| if [ -z "${BEARER_TOKEN}" ] || [ "${BEARER_TOKEN}" = "null" ]; then | ||
| echo "ERROR: Failed to fetch OAuth token from ${KEYFACTOR_AUTH_TOKEN_URL}" | ||
| exit 1 | ||
| fi | ||
|
Comment on lines
+28
to
+38
|
||
| elif [ -n "${KEYFACTOR_USERNAME}" ] && [ -n "${KEYFACTOR_PASSWORD}" ] && [ -n "${KEYFACTOR_DOMAIN}" ]; then | ||
| BEARER_TOKEN="" | ||
| else | ||
| echo "ERROR: Authentication required. Set one of:" | ||
| echo " KEYFACTOR_AUTH_ACCESS_TOKEN" | ||
| echo " KEYFACTOR_AUTH_CLIENT_ID + KEYFACTOR_AUTH_CLIENT_SECRET + KEYFACTOR_AUTH_TOKEN_URL" | ||
| echo " KEYFACTOR_USERNAME + KEYFACTOR_PASSWORD + KEYFACTOR_DOMAIN" | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ -n "${BEARER_TOKEN}" ]; then | ||
| CURL_AUTH=("-H" "Authorization: Bearer ${BEARER_TOKEN}") | ||
| else | ||
| CURL_AUTH=("-u" "${KEYFACTOR_USERNAME}@${KEYFACTOR_DOMAIN}:${KEYFACTOR_PASSWORD}") | ||
| fi | ||
|
|
||
| create_store_type() { | ||
| local name="$1" | ||
| local body="$2" | ||
| echo "Creating ${name} store type..." | ||
| response=$(curl -s -o /dev/null -w "%{http_code}" \ | ||
| -X POST "${BASE_URL}/certificatestoretypes" \ | ||
| -H "Content-Type: application/json" \ | ||
| -H "x-keyfactor-requested-with: APIClient" \ | ||
| "${CURL_AUTH[@]}" \ | ||
| -d "${body}") | ||
| if [ "$response" = "200" ] || [ "$response" = "201" ]; then | ||
| echo " OK (HTTP ${response})" | ||
| else | ||
| echo " FAILED (HTTP ${response})" | ||
| fi | ||
| } | ||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # Fortigate — The IP address or DNS of the Fortigate server | ||
| # --------------------------------------------------------------------------- | ||
| create_store_type "Fortigate" '{ | ||
| "Name": "Fortigate", | ||
| "ShortName": "Fortigate", | ||
| "Capability": "Fortigate", | ||
| "ServerRequired": false, | ||
| "BlueprintAllowed": true, | ||
| "CustomAliasAllowed": "Required", | ||
| "PowerShell": false, | ||
| "PrivateKeyAllowed": "Required", | ||
| "SupportedOperations": { | ||
| "Add": true, | ||
| "Create": false, | ||
| "Discovery": false, | ||
| "Enrollment": false, | ||
| "Remove": true | ||
| }, | ||
| "Properties": [], | ||
| "EntryParameters": [], | ||
| "PasswordOptions": { | ||
| "Style": "Default", | ||
| "EntrySupported": false, | ||
| "StoreRequired": true, | ||
| "StorePassword": { | ||
| "Description": "Enter the Fortigate API Token here", | ||
| "IsPAMEligible": true | ||
| } | ||
| }, | ||
| "StorePathDescription": "Value must contain the VDOM this certificate store will be managing. `root` must be entered to manage the default 'root' VDOM." | ||
| }' | ||
|
|
||
|
|
||
| echo "Completed." | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Creates all 1 store types using kfutil. | ||
| # kfutil reads definitions from the Keyfactor integration catalog. | ||
| # | ||
| # Auth environment variables (first matching method is used): | ||
| # OAuth access token: KEYFACTOR_AUTH_ACCESS_TOKEN | ||
| # OAuth client creds: KEYFACTOR_AUTH_CLIENT_ID + KEYFACTOR_AUTH_CLIENT_SECRET | ||
| # + KEYFACTOR_AUTH_TOKEN_URL | ||
| # Basic auth (AD): KEYFACTOR_HOSTNAME + KEYFACTOR_USERNAME + KEYFACTOR_PASSWORD | ||
| # + KEYFACTOR_DOMAIN | ||
| # | ||
| # Auto-generated by doctool generate-store-type-scripts — do not edit by hand. | ||
|
|
||
| if ! command -v kfutil &> /dev/null; then | ||
| echo "kfutil could not be found. Please install kfutil" | ||
| echo "See https://github.com/Keyfactor/kfutil#quickstart" | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ -z "$KEYFACTOR_HOSTNAME" ]; then | ||
| echo "KEYFACTOR_HOSTNAME not set — launching kfutil login" | ||
| kfutil login | ||
| fi | ||
|
|
||
| kfutil store-types create --name "Fortigate" | ||
|
|
||
| echo "Done. All store types created." |
29 changes: 29 additions & 0 deletions
29
scripts/store_types/powershell/kfutil_create_store_types.ps1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # Creates all 1 store types using kfutil. | ||
| # kfutil reads definitions from the Keyfactor integration catalog. | ||
| # | ||
| # Auth environment variables (first matching method is used): | ||
| # OAuth access token: KEYFACTOR_AUTH_ACCESS_TOKEN | ||
| # OAuth client creds: KEYFACTOR_AUTH_CLIENT_ID + KEYFACTOR_AUTH_CLIENT_SECRET | ||
| # + KEYFACTOR_AUTH_TOKEN_URL | ||
| # Basic auth (AD): KEYFACTOR_HOSTNAME + KEYFACTOR_USERNAME + KEYFACTOR_PASSWORD | ||
| # + KEYFACTOR_DOMAIN | ||
| # | ||
| # Auto-generated by doctool generate-store-type-scripts — do not edit by hand. | ||
|
|
||
| # Uncomment if kfutil is not in your PATH | ||
| # Set-Alias -Name kfutil -Value 'C:\Program Files\Keyfactor\kfutil\kfutil.exe' | ||
|
|
||
| if ($null -eq (Get-Command "kfutil" -ErrorAction SilentlyContinue)) { | ||
| Write-Host "kfutil could not be found. Please install kfutil" | ||
| Write-Host "See https://github.com/Keyfactor/kfutil#quickstart" | ||
| exit 1 | ||
| } | ||
|
|
||
| if (-not $env:KEYFACTOR_HOSTNAME) { | ||
| Write-Host "KEYFACTOR_HOSTNAME not set — launching kfutil login" | ||
| & kfutil login | ||
| } | ||
|
|
||
| & kfutil store-types create --name "Fortigate" | ||
|
|
||
| Write-Host "Done. All store types created." |
100 changes: 100 additions & 0 deletions
100
scripts/store_types/powershell/restmethod_create_store_types.ps1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| # Creates all 1 store types via the Keyfactor Command REST API | ||
| # using PowerShell Invoke-RestMethod. | ||
| # | ||
| # Authentication (first matching method is used): | ||
| # OAuth access token: KEYFACTOR_AUTH_ACCESS_TOKEN | ||
| # OAuth client creds: KEYFACTOR_AUTH_CLIENT_ID + KEYFACTOR_AUTH_CLIENT_SECRET | ||
| # + KEYFACTOR_AUTH_TOKEN_URL | ||
| # Basic auth (AD): KEYFACTOR_USERNAME + KEYFACTOR_PASSWORD + KEYFACTOR_DOMAIN | ||
| # | ||
| # Always required: | ||
| # KEYFACTOR_HOSTNAME Command hostname (e.g. my-command.example.com) | ||
| # | ||
| # Auto-generated by doctool generate-store-type-scripts — do not edit by hand. | ||
|
|
||
| if (-not $env:KEYFACTOR_HOSTNAME) { | ||
| Write-Error "KEYFACTOR_HOSTNAME is required" | ||
| exit 1 | ||
| } | ||
|
|
||
| $uri = "https://$($env:KEYFACTOR_HOSTNAME)/keyfactorapi/certificatestoretypes" | ||
| $headers = @{ | ||
| 'Content-Type' = "application/json" | ||
| 'x-keyfactor-requested-with' = "APIClient" | ||
| } | ||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # Resolve auth | ||
| # --------------------------------------------------------------------------- | ||
| if ($env:KEYFACTOR_AUTH_ACCESS_TOKEN) { | ||
| $headers['Authorization'] = "Bearer $($env:KEYFACTOR_AUTH_ACCESS_TOKEN)" | ||
| } elseif ($env:KEYFACTOR_AUTH_CLIENT_ID -and $env:KEYFACTOR_AUTH_CLIENT_SECRET -and $env:KEYFACTOR_AUTH_TOKEN_URL) { | ||
| Write-Host "Fetching OAuth token..." | ||
| $tokenBody = @{ | ||
| grant_type = 'client_credentials' | ||
| client_id = $env:KEYFACTOR_AUTH_CLIENT_ID | ||
| client_secret = $env:KEYFACTOR_AUTH_CLIENT_SECRET | ||
| } | ||
| $tokenResp = Invoke-RestMethod -Method Post -Uri $env:KEYFACTOR_AUTH_TOKEN_URL -Body $tokenBody | ||
| $headers['Authorization'] = "Bearer $($tokenResp.access_token)" | ||
| } elseif ($env:KEYFACTOR_USERNAME -and $env:KEYFACTOR_PASSWORD -and $env:KEYFACTOR_DOMAIN) { | ||
| $cred = [System.Convert]::ToBase64String( | ||
| [System.Text.Encoding]::ASCII.GetBytes( | ||
| "$($env:KEYFACTOR_USERNAME)@$($env:KEYFACTOR_DOMAIN):$($env:KEYFACTOR_PASSWORD)")) | ||
| $headers['Authorization'] = "Basic $cred" | ||
| } else { | ||
| Write-Error ("Authentication required. Set one of:`n" + | ||
| " KEYFACTOR_AUTH_ACCESS_TOKEN`n" + | ||
| " KEYFACTOR_AUTH_CLIENT_ID + KEYFACTOR_AUTH_CLIENT_SECRET + KEYFACTOR_AUTH_TOKEN_URL`n" + | ||
| " KEYFACTOR_USERNAME + KEYFACTOR_PASSWORD + KEYFACTOR_DOMAIN") | ||
| exit 1 | ||
| } | ||
|
|
||
| function New-StoreType { | ||
| param([string]$Name, [string]$Body) | ||
| Write-Host "Creating $Name store type..." | ||
| try { | ||
| Invoke-RestMethod -Method Post -Uri $uri -Headers $headers -Body $Body -ContentType "application/json" | Out-Null | ||
| Write-Host " OK" | ||
| } catch { | ||
| Write-Warning " FAILED: $($_.Exception.Message)" | ||
| } | ||
| } | ||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # Fortigate — The IP address or DNS of the Fortigate server | ||
| # --------------------------------------------------------------------------- | ||
| New-StoreType "Fortigate" @' | ||
| { | ||
| "Name": "Fortigate", | ||
| "ShortName": "Fortigate", | ||
| "Capability": "Fortigate", | ||
| "ServerRequired": false, | ||
| "BlueprintAllowed": true, | ||
| "CustomAliasAllowed": "Required", | ||
| "PowerShell": false, | ||
| "PrivateKeyAllowed": "Required", | ||
| "SupportedOperations": { | ||
| "Add": true, | ||
| "Create": false, | ||
| "Discovery": false, | ||
| "Enrollment": false, | ||
| "Remove": true | ||
| }, | ||
| "Properties": [], | ||
| "EntryParameters": [], | ||
| "PasswordOptions": { | ||
| "Style": "Default", | ||
| "EntrySupported": false, | ||
| "StoreRequired": true, | ||
| "StorePassword": { | ||
| "Description": "Enter the Fortigate API Token here", | ||
| "IsPAMEligible": true | ||
| } | ||
| }, | ||
| "StorePathDescription": "Value must contain the VDOM this certificate store will be managing. `root` must be entered to manage the default 'root' VDOM." | ||
| } | ||
| '@ | ||
|
|
||
|
|
||
| Write-Host "Completed." |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This Markdown table row contains
||and appears to have two rows merged into one line, which breaks table rendering. Split this into two separate table rows so the compatibility matrix renders correctly.