Commit b72668a0 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix a Proxy race condition 



Issue #3562 describes a problem where a race condition can occur in the
Proxy such that a test "ok" line can appear in the middle of other text
causing the test harness to miss it. The issue is that we do not wait for
the client process to finish after the test is complete, so that process may
continue to write data to stdout/stderr at the same time that the test
harness does.

This commit fixes TLSProxy so that we always wait for the client process to
finish before continuing.

Fixes #3562

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3567)
parent 7f7eb90b

util/TLSProxy/Proxy.pm

+15 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ sub new 
        clientflags => "",

        clientflags => "",

        serverconnects => 1,

        serverconnects => 1,

        serverpid => 0,

        serverpid => 0,

        clientpid => 0,

        reneg => 0,

        reneg => 0,

        sessionfile => undef,

        sessionfile => undef,
@@ -113,6 +114,7 @@ sub clearClient 
    $self->{message_list} = [];

    $self->{message_list} = [];

    $self->{clientflags} = "";

    $self->{clientflags} = "";

    $self->{sessionfile} = undef;

    $self->{sessionfile} = undef;

    $self->{clientpid} = 0;

    $is_tls13 = 0;

    $is_tls13 = 0;

    $ciphersuite = undef;

    $ciphersuite = undef;
@@ -240,6 +242,7 @@ sub clientstart 
            }

            }

            exec($execcmd);

            exec($execcmd);

        }

        }

        $self->clientpid($pid);

    }

    }





    # Wait for incoming connection from client

    # Wait for incoming connection from client
@@ -338,6 +341,10 @@ sub clientstart 
        waitpid( $self->serverpid, 0);

        waitpid( $self->serverpid, 0);

        die "exit code $? from server process\n" if $? != 0;

        die "exit code $? from server process\n" if $? != 0;

    }

    }

    die "clientpid is zero\n" if $self->clientpid == 0;

    print "Waiting for client process to close: ".$self->clientpid."\n";

    waitpid($self->clientpid, 0);



    return 1;

    return 1;

}

}
@@ -531,6 +538,14 @@ sub serverpid 
    }

    }

    return $self->{serverpid};

    return $self->{serverpid};

}

}

sub clientpid

{

    my $self = shift;

    if (@_) {

        $self->{clientpid} = shift;

    }

    return $self->{clientpid};

}





sub fill_known_data

sub fill_known_data

{

{