mirror of
https://github.com/openziti/ziti.git
synced 2026-09-10 16:55:41 +00:00
Andrew Martinez
fb2034245d
* fixes openziti/ziti#3356 adds www-authenticate headers - www-authenticate headers are returned on 401s from API requests - www-authenticate headers are returned during authentication to signal addtional JWT bearer tokens needed (secondary ext jwt) - adds support for additional headers on API errors - adds SecurityTokenCtx for centralized security header processing (legacy, jwt, etc.) - adds SecurityCtx for centralized identity, auth policy, MFA handling - refactors existing JWT authentication methods (oidc, legacy) to use centralized processing where possible
88 lines
3.2 KiB
PowerShell
88 lines
3.2 KiB
PowerShell
$PSDefaultParameterValues += @{ 'New-RegKey:ErrorAction' = 'Stop' }
|
|
try
|
|
{
|
|
# Expected version (without leading "v")
|
|
$ExpectedSwaggerVersion = "0.33.1"
|
|
|
|
Get-Command swagger -ErrorAction "SilentlyContinue" | Out-Null
|
|
if (-not$?)
|
|
{
|
|
throw "Command 'swagger' not installed. See: https://github.com/go-swagger/go-swagger for installation, install version $ExpectedSwaggerVersion"
|
|
}
|
|
|
|
$output = & swagger version 2>&1
|
|
$text = ($output | Out-String).Trim()
|
|
|
|
$m = [regex]::Match($text, 'version:\s*v(\d+\.\d+\.\d+)')
|
|
if( -not ($m.Success)) {
|
|
Pop-Location
|
|
throw "could not parse swagger version, expected 'version: v#.#.#'"
|
|
}
|
|
|
|
if ($m.Groups[1].Value -ne $ExpectedSwaggerVersion) {
|
|
Pop-Location
|
|
throw "swagger version mismatch. Expected v$ExpectedSwaggerVersion, found v" + $m.Groups[1]
|
|
}
|
|
|
|
$zitiEdgeDir = Join-Path $PSScriptRoot "../" -Resolve
|
|
|
|
$copyrightFile = Join-Path $PSScriptRoot "template.copyright.txt" -Resolve
|
|
|
|
$swagSpec = Join-Path $zitiEdgeDir "/specs/swagger.yml" -Resolve
|
|
"...reading spec from $swagSpec"
|
|
|
|
$serverPath = Join-Path $zitiEdgeDir "/rest_server"
|
|
"...removing any existing server from $serverPath"
|
|
Remove-Item $serverPath -Recurse -Force -ErrorAction "SilentlyContinue" | Out-Null
|
|
New-Item -ItemType "directory" -Path $serverPath -ErrorAction "SilentlyContinue" | Out-Null
|
|
|
|
$clientPath = Join-Path $zitiEdgeDir "/rest_client"
|
|
"...removing any existing client from $clientPath"
|
|
Remove-Item $clientPath -Recurse -Force -ErrorAction "SilentlyContinue" | Out-Null
|
|
New-Item -ItemType "directory" -Path $clientPath -ErrorAction "SilentlyContinue" | Out-Null
|
|
|
|
$modelPath = Join-Path $zitiEdgeDir "/rest_model"
|
|
"...removing any existing model from $modelPath"
|
|
Remove-Item $modelPath -Recurse -Force -ErrorAction "SilentlyContinue" | Out-Null
|
|
New-Item -ItemType "directory" -Path $modelPath -ErrorAction "SilentlyContinue" | Out-Null
|
|
|
|
|
|
"...generating server"
|
|
swagger generate server --exclude-main -f $swagSpec -s rest_server -t $zitiEdgeDir -q -r $copyrightFile -m "rest_model"
|
|
if (-not$?)
|
|
{
|
|
throw "Failed to generate server. See above."
|
|
}
|
|
"...generating client"
|
|
swagger generate client -f $swagSpec -c rest_client -t $zitiEdgeDir -q -r $copyrightFile -m "rest_model"
|
|
if (-not$?)
|
|
{
|
|
throw "Failed to generate client. See above."
|
|
}
|
|
|
|
"...fixing up windows slashes"
|
|
# This one file has the command used to generate the server in it w/ paths. The path sep is OS specific.
|
|
# On Windows this causes this one file to show changes depending on the OS that generated it. This
|
|
# works around those changes from showing up in commits by switching to forward slashes.
|
|
#
|
|
# There appears to be no option to suppress this line in the `swagger` executable.
|
|
$configureFile = Join-Path $serverPath "/configure_ziti_fabric.go" -Resolve
|
|
|
|
$content = ""
|
|
foreach ($line in Get-Content $configureFile)
|
|
{
|
|
if ($line -match "^//go:generate swagger generate server")
|
|
{
|
|
$line = $line -replace "\\", "/"
|
|
}
|
|
|
|
$content = $content + $line + "`n"
|
|
}
|
|
|
|
$content | Set-Content $configureFile -nonewline
|
|
|
|
}
|
|
catch
|
|
{
|
|
[Console]::Error.WriteLine($Error[0])
|
|
} |