CI: - GHA/windows: enable OpenSSH server, SysInternals `handle`, `impacket`. Skip `impacket` on MSYS2 due to install failure. Skip OpenSSH server for old/standalone mingw-w64 (building curl without SSH there.) - GHA/windows: make test tool installs a separate step. - GHA/cygwin: enable OpenSSH server. Skip `impacket`: it's compiling for 7 minutes then breaks. Skip `stunnel` due to sluggish test run performance. (This update is unrelated to Azure jobs.) - GHA/linux: migrate Linux jobs from Azure CI. - GHA/linux: migrate scanbuild job from Azure CI. - GHA/linux: enable libssh2 in a job. Also enable valgrind. - CI/windows: enable SSPI in two jobs. - CI/windows: disable zlib in one more job. - CI/windows: improve `if` condition checking GnuTLS. - CI/windows: ignore SFTP/SCP tests as necessary. - universally ignore SCP tests, they fail everywhere. - ignore test 612. - ignore test 613 616 618 with MSYS2 mingw-w64. - ignore test 614 with libssh. - ignore all SFTP with MSYS2 native. - ignore all SFTP with vcpkg with `libssh2[core,zlib]`. - ignore a couple of SFTP tests with MSYS2 mingw-w64. (This matches settings on Azure CI.) - GHA/windows: ignore failing 1451 'Basic SMB request' test for old mingw-w64 7.3.0 (but not for 9.5.0!): ``` 2024-09-11 21:45:59,738 ERROR smbComNegotiate: b'NT LM 0.12\x00' is not in list [...] curl: (7) Could not connect to server [...] FAIL 1451: 'Basic SMB request' SMB ``` Ref: https://github.com/curl/curl/actions/runs/10816280746/job/30007130770#step:13:3546 - CI/Azure: delete, now moved to GHA. sshserver: - sshserver: fix permissions for SSH host key on Windows, allowing sshd to launch. - sshserver: fix initializing config paths with Cygwin/MSYS2 sshd. - sshserver: fix initializing config paths in parallel builds. - sshserver: delete redundant `DenyUsers`. This also opens the way to allow multiple usernames. - sshserver: fix `AllowUsers` for GHA/windows, by allowing the domainless username again. Follow-up to3ee7c676ec#5721 - sshserver: fix `Deprecated option` warnings in `sshd_config`: ``` D:/a/curl/curl/bld/tests/log/2/server/curl_sshd_config line 7: Deprecated option AuthorizedKeysFile2 D:/a/curl/curl/bld/tests/log/2/server/curl_sshd_config line 25: Deprecated option KeyRegenerationInterval D:/a/curl/curl/bld/tests/log/2/server/curl_sshd_config line 35: Deprecated option RhostsRSAAuthentication D:/a/curl/curl/bld/tests/log/2/server/curl_sshd_config line 36: Deprecated option RSAAuthentication D:/a/curl/curl/bld/tests/log/2/server/curl_sshd_config line 37: Deprecated option ServerKeyBits D:/a/curl/curl/bld/tests/log/2/server/curl_sshd_config line 41: Deprecated option UseLogin ``` - sshserver: fix `Deprecated option` warnings in `ssh_config` with Cygwin/MSYS2. - sshserver: fix dumping config files due to the filenames missing their full paths. - sshserver: add workaround to make `logmsg` messages visible. Before this patch they only went to a file and never shown. runtests: - runtests: log details when these Windows commands are called: `handle`, `taskkill`, `tasklist`. - runtests: add documentation links to Windows tools: `handle`, `taskkill`, `tasklist`, `icacls`. - runtests: add `-t` (kill whole tree) option to `taskkill` in `servers.pm`, syncing it with the other `taskkill` call. Follow-up tobc72a78a11#14488 - runtests: show warning if Sysinternals `handle` tool is missing. - runtests: drop Windows XP Home compatibility `tskill` call. The call was made on all Windows versions. It's possibly overkill to do this, because XP Home is probably rarely used for running curl tests these days. In case it's needed, it'd be better to put it under an explicit option. - runtests: show Perl version and path. Fix/silence fallouts: - unit2603: fix building with disabled HTTP support. - unit2604: silence `-Woverlength-strings` warnings in C89 mode. - test437, test1614: fix to pass with no-IPv6 builds. Closes #14859
448 lines
13 KiB
Perl
448 lines
13 KiB
Perl
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
|
|
package processhelp;
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
BEGIN {
|
|
use base qw(Exporter);
|
|
|
|
our @EXPORT = qw(
|
|
portable_sleep
|
|
pidfromfile
|
|
pidexists
|
|
pidwait
|
|
processexists
|
|
killpid
|
|
killsockfilters
|
|
killallsockfilters
|
|
set_advisor_read_lock
|
|
clear_advisor_read_lock
|
|
);
|
|
|
|
# portable sleeping needs Time::HiRes
|
|
eval {
|
|
no warnings "all";
|
|
require Time::HiRes;
|
|
};
|
|
# portable sleeping falls back to native Sleep on Windows
|
|
eval {
|
|
no warnings "all";
|
|
require Win32;
|
|
}
|
|
}
|
|
|
|
use serverhelp qw(
|
|
servername_id
|
|
mainsockf_pidfilename
|
|
datasockf_pidfilename
|
|
logmsg
|
|
);
|
|
|
|
use pathhelp qw(
|
|
os_is_win
|
|
);
|
|
|
|
#######################################################################
|
|
# portable_sleep uses Time::HiRes::sleep if available and falls back
|
|
# to the classic approach of using select(undef, undef, undef, ...).
|
|
# even though that one is not portable due to being implemented using
|
|
# select on Windows: https://perldoc.perl.org/perlport.html#select
|
|
# Therefore it uses Win32::Sleep on Windows systems instead.
|
|
#
|
|
sub portable_sleep {
|
|
my ($seconds) = @_;
|
|
|
|
if($Time::HiRes::VERSION) {
|
|
Time::HiRes::sleep($seconds);
|
|
}
|
|
elsif (os_is_win()) {
|
|
Win32::Sleep($seconds*1000);
|
|
}
|
|
else {
|
|
select(undef, undef, undef, $seconds);
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# pidfromfile returns the pid stored in the given pidfile. The value
|
|
# of the returned pid will never be a negative value. It will be zero
|
|
# on any file related error or if a pid can not be extracted from the
|
|
# given file.
|
|
#
|
|
sub pidfromfile {
|
|
my $pidfile = $_[0];
|
|
my $pid = 0;
|
|
|
|
if(-f $pidfile && -s $pidfile && open(my $pidfh, "<", "$pidfile")) {
|
|
$pid = 0 + <$pidfh>;
|
|
close($pidfh);
|
|
$pid = 0 if($pid < 0);
|
|
}
|
|
return $pid;
|
|
}
|
|
|
|
#######################################################################
|
|
# return Cygwin pid from virtual pid
|
|
#
|
|
sub winpid_to_pid {
|
|
my $vpid = $_[0];
|
|
if(($^O eq 'cygwin' || $^O eq 'msys') && $vpid > 65536) {
|
|
my $pid = Cygwin::winpid_to_pid($vpid - 65536);
|
|
if($pid) {
|
|
return $pid;
|
|
} else {
|
|
return $vpid
|
|
}
|
|
}
|
|
return $vpid;
|
|
}
|
|
|
|
#######################################################################
|
|
# pidexists checks if a process with a given pid exists and is alive.
|
|
# This will return the positive pid if the process exists and is alive.
|
|
# This will return the negative pid if the process exists differently.
|
|
# This will return 0 if the process could not be found.
|
|
#
|
|
sub pidexists {
|
|
my $pid = $_[0];
|
|
|
|
if($pid > 0) {
|
|
# verify if currently existing Windows process
|
|
$pid = winpid_to_pid($pid);
|
|
if ($pid > 65536 && os_is_win()) {
|
|
$pid -= 65536;
|
|
if($^O ne 'MSWin32') {
|
|
my $filter = "PID eq $pid";
|
|
# https://ss64.com/nt/tasklist.html
|
|
my $result = `tasklist -fi \"$filter\" 2>nul`;
|
|
if(index($result, "$pid") != -1) {
|
|
return -$pid;
|
|
}
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
# verify if currently existing and alive
|
|
if(kill(0, $pid)) {
|
|
return $pid;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#######################################################################
|
|
# pidterm asks the process with a given pid to terminate gracefully.
|
|
#
|
|
sub pidterm {
|
|
my $pid = $_[0];
|
|
|
|
if($pid > 0) {
|
|
# request the process to quit
|
|
$pid = winpid_to_pid($pid);
|
|
if ($pid > 65536 && os_is_win()) {
|
|
$pid -= 65536;
|
|
if($^O ne 'MSWin32') {
|
|
my $filter = "PID eq $pid";
|
|
# https://ss64.com/nt/tasklist.html
|
|
my $result = `tasklist -fi \"$filter\" 2>nul`;
|
|
if(index($result, "$pid") != -1) {
|
|
# https://ss64.com/nt/taskkill.html
|
|
system("taskkill -fi \"$filter\" >nul 2>&1");
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
|
|
# signal the process to terminate
|
|
kill("TERM", $pid);
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# pidkill kills the process with a given pid mercilessly and forcefully.
|
|
#
|
|
sub pidkill {
|
|
my $pid = $_[0];
|
|
|
|
if($pid > 0) {
|
|
# request the process to quit
|
|
$pid = winpid_to_pid($pid);
|
|
if ($pid > 65536 && os_is_win()) {
|
|
$pid -= 65536;
|
|
if($^O ne 'MSWin32') {
|
|
my $filter = "PID eq $pid";
|
|
# https://ss64.com/nt/tasklist.html
|
|
my $cmd = "tasklist -fi \"$filter\" 2>nul";
|
|
logmsg "Executing: '$cmd'\n";
|
|
my $result = `$cmd`;
|
|
if(index($result, "$pid") != -1) {
|
|
# https://ss64.com/nt/taskkill.html
|
|
my $cmd = "taskkill -f -t -fi \"$filter\" >nul 2>&1";
|
|
logmsg "Executing: '$cmd'\n";
|
|
system($cmd);
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
|
|
# signal the process to terminate
|
|
kill("KILL", $pid);
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# pidwait waits for the process with a given pid to be terminated.
|
|
#
|
|
sub pidwait {
|
|
my $pid = $_[0];
|
|
my $flags = $_[1];
|
|
|
|
$pid = winpid_to_pid($pid);
|
|
# check if the process exists
|
|
if ($pid > 65536 && os_is_win()) {
|
|
if($flags == &WNOHANG) {
|
|
return pidexists($pid)?0:$pid;
|
|
}
|
|
while(pidexists($pid)) {
|
|
portable_sleep(0.01);
|
|
}
|
|
return $pid;
|
|
}
|
|
|
|
# wait on the process to terminate
|
|
return waitpid($pid, $flags);
|
|
}
|
|
|
|
#######################################################################
|
|
# processexists checks if a process with the pid stored in the given
|
|
# pidfile exists and is alive. This will return 0 on any file related
|
|
# error or if a pid can not be extracted from the given file. When a
|
|
# process with the same pid as the one extracted from the given file
|
|
# is currently alive this returns that positive pid. Otherwise, when
|
|
# the process is not alive, will return the negative value of the pid.
|
|
#
|
|
sub processexists {
|
|
use POSIX ":sys_wait_h";
|
|
my $pidfile = $_[0];
|
|
|
|
# fetch pid from pidfile
|
|
my $pid = pidfromfile($pidfile);
|
|
|
|
if($pid > 0) {
|
|
# verify if currently alive
|
|
if(pidexists($pid)) {
|
|
return $pid;
|
|
}
|
|
else {
|
|
# get rid of the certainly invalid pidfile
|
|
unlink($pidfile) if($pid == pidfromfile($pidfile));
|
|
# reap its dead children, if not done yet
|
|
pidwait($pid, &WNOHANG);
|
|
# negative return value means dead process
|
|
return -$pid;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#######################################################################
|
|
# killpid attempts to gracefully stop processes in the given pid list
|
|
# with a SIGTERM signal and SIGKILLs those which haven't died on time.
|
|
#
|
|
sub killpid {
|
|
my ($verbose, $pidlist) = @_;
|
|
use POSIX ":sys_wait_h";
|
|
my @requested;
|
|
my @signalled;
|
|
my @reapchild;
|
|
|
|
# The 'pidlist' argument is a string of whitespace separated pids.
|
|
return if(not defined($pidlist));
|
|
|
|
# Make 'requested' hold the non-duplicate pids from 'pidlist'.
|
|
@requested = split(' ', $pidlist);
|
|
return if(not @requested);
|
|
if(scalar(@requested) > 2) {
|
|
@requested = sort({$a <=> $b} @requested);
|
|
}
|
|
for(my $i = scalar(@requested) - 2; $i >= 0; $i--) {
|
|
if($requested[$i] == $requested[$i+1]) {
|
|
splice @requested, $i+1, 1;
|
|
}
|
|
}
|
|
|
|
# Send a SIGTERM to processes which are alive to gracefully stop them.
|
|
foreach my $tmp (@requested) {
|
|
chomp $tmp;
|
|
if($tmp =~ /^(\d+)$/) {
|
|
my $pid = $1;
|
|
if($pid > 0) {
|
|
if(pidexists($pid)) {
|
|
print("RUN: Process with pid $pid signalled to die\n")
|
|
if($verbose);
|
|
pidterm($pid);
|
|
push @signalled, $pid;
|
|
}
|
|
else {
|
|
print("RUN: Process with pid $pid already dead\n")
|
|
if($verbose);
|
|
# if possible reap its dead children
|
|
pidwait($pid, &WNOHANG);
|
|
push @reapchild, $pid;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
# Allow all signalled processes five seconds to gracefully die.
|
|
if(@signalled) {
|
|
my $twentieths = 5 * 20;
|
|
while($twentieths--) {
|
|
for(my $i = scalar(@signalled) - 1; $i >= 0; $i--) {
|
|
my $pid = $signalled[$i];
|
|
if(!pidexists($pid)) {
|
|
print("RUN: Process with pid $pid gracefully died\n")
|
|
if($verbose);
|
|
splice @signalled, $i, 1;
|
|
# if possible reap its dead children
|
|
pidwait($pid, &WNOHANG);
|
|
push @reapchild, $pid;
|
|
}
|
|
}
|
|
last if(not scalar(@signalled));
|
|
# give any zombies of us a chance to move on to the afterlife
|
|
pidwait(0, &WNOHANG);
|
|
portable_sleep(0.05);
|
|
}
|
|
}
|
|
|
|
# Mercilessly SIGKILL processes still alive.
|
|
if(@signalled) {
|
|
foreach my $pid (@signalled) {
|
|
if($pid > 0) {
|
|
print("RUN: Process with pid $pid forced to die with SIGKILL\n")
|
|
if($verbose);
|
|
pidkill($pid);
|
|
# if possible reap its dead children
|
|
pidwait($pid, &WNOHANG);
|
|
push @reapchild, $pid;
|
|
}
|
|
}
|
|
}
|
|
|
|
# Reap processes dead children for sure.
|
|
if(@reapchild) {
|
|
foreach my $pid (@reapchild) {
|
|
if($pid > 0) {
|
|
pidwait($pid, 0);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# killsockfilters kills sockfilter processes for a given server.
|
|
#
|
|
sub killsockfilters {
|
|
my ($piddir, $proto, $ipvnum, $idnum, $verbose, $which) = @_;
|
|
my $server;
|
|
my $pidfile;
|
|
my $pid;
|
|
|
|
return if($proto !~ /^(ftp|imap|pop3|smtp)$/);
|
|
|
|
die "unsupported sockfilter: $which"
|
|
if($which && ($which !~ /^(main|data)$/));
|
|
|
|
$server = servername_id($proto, $ipvnum, $idnum) if($verbose);
|
|
|
|
if(!$which || ($which eq 'main')) {
|
|
$pidfile = mainsockf_pidfilename($piddir, $proto, $ipvnum, $idnum);
|
|
$pid = processexists($pidfile);
|
|
if($pid > 0) {
|
|
printf("* kill pid for %s-%s => %d\n", $server,
|
|
($proto eq 'ftp')?'ctrl':'filt', $pid) if($verbose);
|
|
pidkill($pid);
|
|
pidwait($pid, 0);
|
|
}
|
|
unlink($pidfile) if(-f $pidfile);
|
|
}
|
|
|
|
return if($proto ne 'ftp');
|
|
|
|
if(!$which || ($which eq 'data')) {
|
|
$pidfile = datasockf_pidfilename($piddir, $proto, $ipvnum, $idnum);
|
|
$pid = processexists($pidfile);
|
|
if($pid > 0) {
|
|
printf("* kill pid for %s-data => %d\n", $server,
|
|
$pid) if($verbose);
|
|
pidkill($pid);
|
|
pidwait($pid, 0);
|
|
}
|
|
unlink($pidfile) if(-f $pidfile);
|
|
}
|
|
}
|
|
|
|
#######################################################################
|
|
# killallsockfilters kills sockfilter processes for all servers.
|
|
#
|
|
sub killallsockfilters {
|
|
my ($piddir, $verbose) = @_;
|
|
|
|
for my $proto (('ftp', 'imap', 'pop3', 'smtp')) {
|
|
for my $ipvnum (('4', '6')) {
|
|
for my $idnum (('1', '2')) {
|
|
killsockfilters($piddir, $proto, $ipvnum, $idnum, $verbose);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
sub set_advisor_read_lock {
|
|
my ($filename) = @_;
|
|
|
|
my $fileh;
|
|
if(open($fileh, ">", "$filename") && close($fileh)) {
|
|
return;
|
|
}
|
|
printf "Error creating lock file $filename error: $!\n";
|
|
}
|
|
|
|
|
|
sub clear_advisor_read_lock {
|
|
my ($filename) = @_;
|
|
|
|
if(-f $filename) {
|
|
unlink($filename);
|
|
}
|
|
}
|
|
|
|
|
|
1;
|