@rem asadmin is for automatic elevation to administrator. Separate window will be created (seems unavoidable with current elevation mechanism) and user will still get security prompt (probably reasonable).
@ -119,7 +119,7 @@ set ^"endlocal=for %%# in (1 2) do if %%#==2 (%\n%
# -- Primary payload target is Tcl, with sh,bash,powershell as helpers
# -- but it may equally be used with any of these being the primary script.
# -- It is tuned to run when called as a batch file, a tcl script a sh/bash script or a pwsh/powershell script
# -- It is tuned to run (and possibly divert to different payload shell) when called from cmd.exe as a batch file, tclsh,sh,zsh,bash,perl or pwsh/powershell script
# -- i.e it is a polyglot file.
# -- The payload target (by os) is defined in the nextshell block at the top which is constructed when generating the polyglot
# -- using the tcl 'dev scriptwrap.multishell' command in a tcl punk shell
# -- The payload can be tcl,perl,powershell/pwsh or zsh/bash.
# -- The specific layout including some lines that appear just as comments is quite sensitive to change.
# -- It can be called on unix or windows platforms with or without the interpreter being specified on the commandline.
#use 'command -v' (shell builtin preferred over external which)
shellpath=`command -v $interp`
shellfolder="${shellpath%/*}" #avoid dependency on basename or dirname
#"c:/windows/system32/" is quite likely in the path ahead of msys,git etc.
#This breaks calls to various unix utils such as sed etc (wsl related?)
export PATH="$shellfolder${PATH:+:${PATH}}"
elif [[ "$OSTYPE" == "win32" ]]; then
os="win32"
@ -1008,8 +1164,46 @@ exitcode=0
#-- sh/bash launches nextscript here instead of shebang line at top
if [["$nextshelltype"!="bash"&&"$nextshelltype"!="none"]];then
echo zsh/bash launching subshell of type: $nextshelltype shellpath: $nextshellpath on "$0" with args "$@"
script="$0"
if [["$nextshelltype"=="pwsh"||"$nextshelltype" == "powershell" ]]; then
#powershell requires the file extension to be .ps1 (always - on windows)
#on other platforms it's not required if a shebang line is used - but this script must be shebangless for portability and to maintain polyglot capabilities.
cmdpattern="[.]cmd$"
if [["$script"=~$cmdpattern]];then
ps1script="${script%????}.ps1"
if !cmp-s"$script""$ps1script";then
#ps1script either different or missing
#on windows - batch script copies .cmd -> .ps1 if not identical
cp -f "$script""$ps1script"
fi
script=$ps1script
fi
fi
if [["$plat"=="MSYS_NT"* ]]; then
#we need to deal with MSYS argument mangling
cmdpattern="^cmd.exe |^cmd "
#do not double quote cmdpattern - or it will be treated as literal string
if [["$nextshellpath"=~$cmdpattern]];then
#for now - tell the user what's going on
echo"cmd call via msys detected. performing translation of /c to //c and escaping backslashes in script path"
#flags to cmd.exe such as /c are interpreted by msys as looking like a unix path
#review - for nextshellpath targets specified in the block for win32 - we don't expect unix paths (?)
#what about other flags? - can we just double up all forward slashes?
nextshellpath="${nextshellpath// \/c / \/\/c }"
echo"new nextshellpath: ${nextshellpath}"
#don't double quote this
script=${script//\\/\\\\}
fi
echo"calling ${nextshellpath} $script $@"
# eval is required here - but why?
eval ${nextshellpath} "$script""$@"
else
#e.g /usr/bin/env tclsh "$0""$@"
${nextshellpath} "$0""$@"
${nextshellpath} "$script""$@"
fi
exitcode=$?
#echo "zsh/bash reporting exitcode: ${exitcode}"
@ -1204,18 +1398,44 @@ if ($match.Success) {
$admininfo = $match.Groups[1].Value
$asadmin = $admininfo.Contains("asadmin=1")
if ($asadmin){
if (-not([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)){
# If not elevated, relaunch with elevated privileges
if ($args[0]-eq"PUNK-ELEVATED"){
# May be present if launch and elevation was done via cmd.exe script
# shift away first arg
$newargs = $args | Select-Object -Skip 1
} else {
$newargs = $args
}
# -Wait e.g for starting a service or other operations which remainder of script may depend on
if (-not([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)){
# If not elevated, relaunch with elevated privileges
Write-Host "Powershell elevating using start-process with -Verb RunAs"
#.. but it is impossible to modify or reassign the automatic $args variable
# so let's start yet another whole new process just to remove one leading argument so the custom script can operate on parameters cleanly - thanks powershell :/
@rem asadmin is for automatic elevation to administrator. Separate window will be created (seems unavoidable with current elevation mechanism) and user will still get security prompt (probably reasonable).
@ -119,7 +119,7 @@ set ^"endlocal=for %%# in (1 2) do if %%#==2 (%\n%
# -- Primary payload target is Tcl, with sh,bash,powershell as helpers
# -- but it may equally be used with any of these being the primary script.
# -- It is tuned to run when called as a batch file, a tcl script a sh/bash script or a pwsh/powershell script
# -- It is tuned to run (and possibly divert to different payload shell) when called from cmd.exe as a batch file, tclsh,sh,zsh,bash,perl or pwsh/powershell script
# -- i.e it is a polyglot file.
# -- The payload target (by os) is defined in the nextshell block at the top which is constructed when generating the polyglot
# -- using the tcl 'dev scriptwrap.multishell' command in a tcl punk shell
# -- The payload can be tcl,perl,powershell/pwsh or zsh/bash.
# -- The specific layout including some lines that appear just as comments is quite sensitive to change.
# -- It can be called on unix or windows platforms with or without the interpreter being specified on the commandline.
# -- e.g ./scriptname.cmd in sh or zsh or bash
@ -720,7 +806,13 @@ do if not defined param1 set %%~"param1=%2%%~"
rename set ""; rename S set; set k {-- "$@""a}; if {[info exists ::env($k)]} {unset ::env($k)} ;# tidyup and restore
if {[filesize$script_as_called]!=[filesize$script_ps1]}{
setneeds_updating 1
} else {
#both exist with same size - do full check that they're identical
catch {package require sha256}
if {[packageprovidesha256]ne""}{
seth1 [sha2::sha256 -hex -file $script_as_called]
seth2 [sha2::sha256 -hex -file $script_ps1]
if {[stringlength$h1]!=64||[stringlength$h2]!=64}{
setneeds_updating 1
} elseif {$h1 ne $h2} {
setneeds_updating 1
}
} else {
#manually compare - scripts aren't too big, so slurp and string compare is fine
setfd [open $script_as_called]
chan configure $fd -translation binary
setdata1 [read $fd]
close $fd
setfd [open $script_ps1]
chan configure $fd -translation binary
setdata2 [read $fd]
close $fd
if {![stringequal$data1$data2]}{
setneeds_updating 1
}
}
}
}
if {$needs_updating}{
file copy -force $script_as_called $script_ps1
}
} else {
setscrname [info script]
#when called on the .ps1 - we assume it's up to date - review
}
setscrname $script_ps1
#set arglist [list]
#foreach a $::argv {
# set a "'$a'"
# lappend arglist $a
#}
} else {
setscrname $script_as_called
setarglist $::argv
}
puts stdout "tclsh launching subshell of type: $nextshelltype shellpath: $nextshellpath on script $scrname with args: $arglist"
#todo - handle /usr/bin/env
#todo - exitcode
if {[llength$nextshellpath]== 1 && [string index $nextshellpath 0] eq {"} && [string index $nextshellpath end] eq {"}} {
setnextshell_words [list $nextshellpath]
#review - test spaced quoted words in nextshellpath?
#
#if {[llength $nextshellpath] == 1 && [string index $nextshellpath 0] eq {"} && [string index $nextshellpath end] eq {"}} {
# set nextshell_words [list $nextshellpath]
#} else {
# set nextshell_words $nextshellpath
#}
#perform any msys argument munging on a cmd/cmd.exe based nextshellpath before we convert the first word to an auto_exec path
switch -glob -- $plat {
"msys" - "mingw*" {
setcmdword [lindex $nextshellpath 0]
#we only act on cmd or cmd.exe - not a full path such as c:/WINDOWS/system32/cmd.exe
#the nextshellpath should generally be configured as cmd /c ... or cmd.exe ... but specifying it as a path could allow bypassing this un-munging.
#The un-munging only applies to msys/mingw, so such bypassing should be unnecessary - review
#maint: keep this munging in sync with zsh/bash and perl blocks which must also do msys mangling
if {[regexp{^cmd$|^cmd[.]exe$}$cmdword]}{
#need to deal with msys argument munging
#for now we only deal with /C or /c - todo - other cmd.exe flags?
#In this context we would usually only be using cmd.exe /c to launch older 'desktop' powershell to avoid spaced-argument problems - so we aren't expecting other flags
setnew_nextshellpath [list $cmdword]
#for now - just do what zsh munging does - bash regex/string/array processing is tedious and footgunny for the unfamiliar (me),
#so determine the minimum viable case for code there, then port behaviour to perl/tcl msys munging sections.
foreach w [lrange $nextshellpath 1 end] {
if {[regexp{^/[Cc]$}$w]}{
lappend new_nextshellpath {//C}
} else {
setnextshell_words $nextshellpath
lappend new_nextshellpath $w
}
}
setnextshellpath $new_nextshellpath
}
setns_firstword [lindex $nextshellpath 0]
if {[stringindex$ns_firstword0]eq{"}&&[stringindex$ns_firstwordend]eq{"}}{
setns_firstword [string range $ns_firstword 1 end-1]
}
}
setns_firstword [lindex $nextshellpath 0]
#review - is this test for extra layer of double quoting on first word really necessary?
#if we are treaing $nextshellpath as a tcl list - the first layer of double quotes will already have disappeared
##if {[string index $ns_firstword 0] eq {"} && [string index $ns_firstword end] eq {"}} {
## set ns_firstword [string range $ns_firstword 1 end-1]
##}
if {[stringmatch{/*/env}$ns_firstword]&&$::tcl_platform(platform)ne"windows"}{
if {$::tcl_platform(platform)ne"windows"&&[stringmatch{/*/env}$ns_firstword]}{
setexec_part $nextshellpath
} else {
setepath [auto_execok $ns_firstword]
@ -794,6 +974,10 @@ if {$nextshelltype ne "tcl" && $nextshelltype ne "none"} {
#fallback - doesn't seem to work in zsh - untested in early bash
IFS=$'\n' arr_oslines=($shellconfiglines)
IFS=$' \t\n'
# review
fi
nextshellpath=""
nextshelltype=""
@ -1008,8 +1205,55 @@ exitcode=0
#-- sh/bash launches nextscript here instead of shebang line at top
if [["$nextshelltype"!="bash"&&"$nextshelltype"!="none"]];then
echo zsh/bash launching subshell of type: $nextshelltype shellpath: $nextshellpath on "$0" with args "$@"
script="$0"
if [["$nextshelltype"=="pwsh"||"$nextshelltype" == "powershell" ]]; then
#powershell requires the file extension to be .ps1 (always - on windows)
#on other platforms it's not required if a shebang line is used - but this script must be shebangless for portability and to maintain polyglot capabilities.
cmdpattern="[.]cmd$"
if [["$script"=~$cmdpattern]];then
ps1script="${script%????}.ps1"
if !cmp-s"$script""$ps1script";then
#ps1script either different or missing
#on windows - batch script copies .cmd -> .ps1 if not identical
cp -f "$script""$ps1script"
fi
script=$ps1script
fi
fi
if [["$plat"=="MSYS_NT"* ]]; then
#we need to deal with MSYS argument munging
cmdpattern="^cmd.exe |^cmd "
#do not double quote cmdpattern - or it will be treated as literal string
if [["$nextshellpath"=~$cmdpattern]];then
#for now - tell the user what's going on
echo"cmd call via msys detected. performing translation of /c to //c and escaping backslashes in script path"
#flags to cmd.exe such as /c are interpreted by msys as looking like a unix path
#review - for nextshellpath targets specified in the block for win32 - we don't expect unix paths (?)
#what about other flags? - can we just double up all forward slashes?
#maint: keep this munging in sync with the tcl block and perl block which must also do msys munging
cmd_array+=("$script") #add script, which may contain spaces as a single entry ?
cmd_array+=( "$@" ) #add each element of args to array as a separate entry (equiv ? "${arr[@]}")
# printf "%s\n""${cmd_array[@]}"
"${cmd_array[@]}"
# this works to make nextshellpath run - but joins $@ members incorrectly
#eval ${nextshellpath} "$script""$@"
else
#e.g /usr/bin/env tclsh "$0""$@"
${nextshellpath} "$0""$@"
${nextshellpath} "$script""$@"
fi
exitcode=$?
#echo "zsh/bash reporting exitcode: ${exitcode}"
@ -1328,18 +1572,44 @@ if ($match.Success) {
$admininfo = $match.Groups[1].Value
$asadmin = $admininfo.Contains("asadmin=1")
if ($asadmin){
if (-not([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)){
# If not elevated, relaunch with elevated privileges
if ($args[0]-eq"PUNK-ELEVATED"){
# May be present if launch and elevation was done via cmd.exe script
# shift away first arg
$newargs = $args | Select-Object -Skip 1
} else {
$newargs = $args
}
# -Wait e.g for starting a service or other operations which remainder of script may depend on
if (-not([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)){
# If not elevated, relaunch with elevated privileges
Write-Host "Powershell elevating using start-process with -Verb RunAs"
#.. but it is impossible to modify or reassign the automatic $args variable
# so let's start yet another whole new process just to remove one leading argument so the custom script can operate on parameters cleanly - thanks powershell :/
@rem asadmin is for automatic elevation to administrator. Separate window will be created (seems unavoidable with current elevation mechanism) and user will still get security prompt (probably reasonable).
@ -119,7 +119,7 @@ set ^"endlocal=for %%# in (1 2) do if %%#==2 (%\n%
# -- Primary payload target is Tcl, with sh,bash,powershell as helpers
# -- but it may equally be used with any of these being the primary script.
# -- It is tuned to run when called as a batch file, a tcl script a sh/bash script or a pwsh/powershell script
# -- It is tuned to run (and possibly divert to different payload shell) when called from cmd.exe as a batch file, tclsh,sh,zsh,bash,perl or pwsh/powershell script
# -- i.e it is a polyglot file.
# -- The payload target (by os) is defined in the nextshell block at the top which is constructed when generating the polyglot
# -- using the tcl 'dev scriptwrap.multishell' command in a tcl punk shell
# -- The payload can be tcl,perl,powershell/pwsh or zsh/bash.
# -- The specific layout including some lines that appear just as comments is quite sensitive to change.
# -- It can be called on unix or windows platforms with or without the interpreter being specified on the commandline.
# -- e.g ./scriptname.cmd in sh or zsh or bash
@ -720,7 +806,13 @@ do if not defined param1 set %%~"param1=%2%%~"
rename set ""; rename S set; set k {-- "$@""a}; if {[info exists ::env($k)]} {unset ::env($k)} ;# tidyup and restore
if {[filesize$script_as_called]!=[filesize$script_ps1]}{
setneeds_updating 1
} else {
#both exist with same size - do full check that they're identical
catch {package require sha256}
if {[packageprovidesha256]ne""}{
seth1 [sha2::sha256 -hex -file $script_as_called]
seth2 [sha2::sha256 -hex -file $script_ps1]
if {[stringlength$h1]!=64||[stringlength$h2]!=64}{
setneeds_updating 1
} elseif {$h1 ne $h2} {
setneeds_updating 1
}
} else {
#manually compare - scripts aren't too big, so slurp and string compare is fine
setfd [open $script_as_called]
chan configure $fd -translation binary
setdata1 [read $fd]
close $fd
setfd [open $script_ps1]
chan configure $fd -translation binary
setdata2 [read $fd]
close $fd
if {![stringequal$data1$data2]}{
setneeds_updating 1
}
}
}
}
if {$needs_updating}{
file copy -force $script_as_called $script_ps1
}
} else {
setscrname [info script]
#when called on the .ps1 - we assume it's up to date - review
}
setscrname $script_ps1
#set arglist [list]
#foreach a $::argv {
# set a "'$a'"
# lappend arglist $a
#}
} else {
setscrname $script_as_called
setarglist $::argv
}
puts stdout "tclsh launching subshell of type: $nextshelltype shellpath: $nextshellpath on script $scrname with args: $arglist"
#todo - handle /usr/bin/env
#todo - exitcode
if {[llength$nextshellpath]== 1 && [string index $nextshellpath 0] eq {"} && [string index $nextshellpath end] eq {"}} {
setnextshell_words [list $nextshellpath]
#review - test spaced quoted words in nextshellpath?
#
#if {[llength $nextshellpath] == 1 && [string index $nextshellpath 0] eq {"} && [string index $nextshellpath end] eq {"}} {
# set nextshell_words [list $nextshellpath]
#} else {
# set nextshell_words $nextshellpath
#}
#perform any msys argument munging on a cmd/cmd.exe based nextshellpath before we convert the first word to an auto_exec path
switch -glob -- $plat {
"msys" - "mingw*" {
setcmdword [lindex $nextshellpath 0]
#we only act on cmd or cmd.exe - not a full path such as c:/WINDOWS/system32/cmd.exe
#the nextshellpath should generally be configured as cmd /c ... or cmd.exe ... but specifying it as a path could allow bypassing this un-munging.
#The un-munging only applies to msys/mingw, so such bypassing should be unnecessary - review
#maint: keep this munging in sync with zsh/bash and perl blocks which must also do msys mangling
if {[regexp{^cmd$|^cmd[.]exe$}$cmdword]}{
#need to deal with msys argument munging
#for now we only deal with /C or /c - todo - other cmd.exe flags?
#In this context we would usually only be using cmd.exe /c to launch older 'desktop' powershell to avoid spaced-argument problems - so we aren't expecting other flags
setnew_nextshellpath [list $cmdword]
#for now - just do what zsh munging does - bash regex/string/array processing is tedious and footgunny for the unfamiliar (me),
#so determine the minimum viable case for code there, then port behaviour to perl/tcl msys munging sections.
foreach w [lrange $nextshellpath 1 end] {
if {[regexp{^/[Cc]$}$w]}{
lappend new_nextshellpath {//C}
} else {
setnextshell_words $nextshellpath
lappend new_nextshellpath $w
}
}
setnextshellpath $new_nextshellpath
}
}
setns_firstword [lindex $nextshellpath 0]
if {[stringindex$ns_firstword0]eq{"}&&[stringindex$ns_firstwordend]eq{"}}{
setns_firstword [string range $ns_firstword 1 end-1]
}
if {[stringmatch{/*/env}$ns_firstword]&&$::tcl_platform(platform)ne"windows"}{
setns_firstword [lindex $nextshellpath 0]
#review - is this test for extra layer of double quoting on first word really necessary?
#if we are treaing $nextshellpath as a tcl list - the first layer of double quotes will already have disappeared
##if {[string index $ns_firstword 0] eq {"} && [string index $ns_firstword end] eq {"}} {
## set ns_firstword [string range $ns_firstword 1 end-1]
##}
if {$::tcl_platform(platform)ne"windows"&&[stringmatch{/*/env}$ns_firstword]}{
setexec_part $nextshellpath
} else {
setepath [auto_execok $ns_firstword]
@ -794,6 +974,10 @@ if {$nextshelltype ne "tcl" && $nextshelltype ne "none"} {
#fallback - doesn't seem to work in zsh - untested in early bash
IFS=$'\n' arr_oslines=($shellconfiglines)
IFS=$' \t\n'
# review
fi
nextshellpath=""
nextshelltype=""
@ -1008,8 +1205,55 @@ exitcode=0
#-- sh/bash launches nextscript here instead of shebang line at top
if [["$nextshelltype"!="bash"&&"$nextshelltype"!="none"]];then
echo zsh/bash launching subshell of type: $nextshelltype shellpath: $nextshellpath on "$0" with args "$@"
script="$0"
if [["$nextshelltype"=="pwsh"||"$nextshelltype" == "powershell" ]]; then
#powershell requires the file extension to be .ps1 (always - on windows)
#on other platforms it's not required if a shebang line is used - but this script must be shebangless for portability and to maintain polyglot capabilities.
cmdpattern="[.]cmd$"
if [["$script"=~$cmdpattern]];then
ps1script="${script%????}.ps1"
if !cmp-s"$script""$ps1script";then
#ps1script either different or missing
#on windows - batch script copies .cmd -> .ps1 if not identical
cp -f "$script""$ps1script"
fi
script=$ps1script
fi
fi
if [["$plat"=="MSYS_NT"* ]]; then
#we need to deal with MSYS argument munging
cmdpattern="^cmd.exe |^cmd "
#do not double quote cmdpattern - or it will be treated as literal string
if [["$nextshellpath"=~$cmdpattern]];then
#for now - tell the user what's going on
echo"cmd call via msys detected. performing translation of /c to //c and escaping backslashes in script path"
#flags to cmd.exe such as /c are interpreted by msys as looking like a unix path
#review - for nextshellpath targets specified in the block for win32 - we don't expect unix paths (?)
#what about other flags? - can we just double up all forward slashes?
#maint: keep this munging in sync with the tcl block and perl block which must also do msys munging
#review - how can we test if another url such as ssh://git@pcm-gitea1.corp.intx.com.au:2222/jn/punkshell is actually the same repo, without cloning and comparing files/history?
@ -1279,18 +1524,44 @@ if ($match.Success) {
$admininfo = $match.Groups[1].Value
$asadmin = $admininfo.Contains("asadmin=1")
if ($asadmin){
if (-not([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)){
# If not elevated, relaunch with elevated privileges
if ($args[0]-eq"PUNK-ELEVATED"){
# May be present if launch and elevation was done via cmd.exe script
# shift away first arg
$newargs = $args | Select-Object -Skip 1
} else {
$newargs = $args
}
# -Wait e.g for starting a service or other operations which remainder of script may depend on
if (-not([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)){
# If not elevated, relaunch with elevated privileges
Write-Host "Powershell elevating using start-process with -Verb RunAs"
#.. but it is impossible to modify or reassign the automatic $args variable
# so let's start yet another whole new process just to remove one leading argument so the custom script can operate on parameters cleanly - thanks powershell :/
#review - how can we test if another url such as ssh://git@pcm-gitea1.corp.intx.com.au:2222/jn/punkshell is actually the same repo, without cloning and comparing files/history?
