mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-22 14:04:58 +02:00
26e789fbfd
Fixes bug 4893. These changes are pure mechanical, and were generated with this perl script: /usr/bin/perl -w -i.bak -p s/crypto_pk_env_t/crypto_pk_t/g; s/crypto_dh_env_t/crypto_dh_t/g; s/crypto_cipher_env_t/crypto_cipher_t/g; s/crypto_digest_env_t/crypto_digest_t/g; s/aes_free_cipher/aes_cipher_free/g; s/crypto_free_cipher_env/crypto_cipher_free/g; s/crypto_free_digest_env/crypto_digest_free/g; s/crypto_free_pk_env/crypto_pk_free/g; s/_crypto_dh_env_get_dh/_crypto_dh_get_dh/g; s/_crypto_new_pk_env_rsa/_crypto_new_pk_from_rsa/g; s/_crypto_pk_env_get_evp_pkey/_crypto_pk_get_evp_pkey/g; s/_crypto_pk_env_get_rsa/_crypto_pk_get_rsa/g; s/crypto_new_cipher_env/crypto_cipher_new/g; s/crypto_new_digest_env/crypto_digest_new/g; s/crypto_new_digest256_env/crypto_digest256_new/g; s/crypto_new_pk_env/crypto_pk_new/g; s/crypto_create_crypto_env/crypto_cipher_new/g; s/connection_create_listener/connection_listener_new/g; s/smartlist_create/smartlist_new/g; s/transport_create/transport_new/g;
148 lines
3.4 KiB
C
148 lines
3.4 KiB
C
/* Copyright (c) 2001-2004, Roger Dingledine.
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
|
* Copyright (c) 2007-2011, The Tor Project, Inc. */
|
|
/* See LICENSE for licensing information */
|
|
|
|
#include "orconfig.h"
|
|
#define PT_PRIVATE
|
|
#include "or.h"
|
|
#include "transports.h"
|
|
#include "circuitbuild.h"
|
|
#include "test.h"
|
|
|
|
static void
|
|
reset_mp(managed_proxy_t *mp)
|
|
{
|
|
mp->conf_state = PT_PROTO_LAUNCHED;
|
|
SMARTLIST_FOREACH(mp->transports, transport_t *, t, transport_free(t));
|
|
smartlist_clear(mp->transports);
|
|
}
|
|
|
|
static void
|
|
test_pt_parsing(void)
|
|
{
|
|
char line[200];
|
|
|
|
managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t));
|
|
mp->conf_state = PT_PROTO_INFANT;
|
|
mp->transports = smartlist_new();
|
|
|
|
/* incomplete cmethod */
|
|
strcpy(line,"CMETHOD trebuchet");
|
|
test_assert(parse_cmethod_line(line, mp) < 0);
|
|
|
|
reset_mp(mp);
|
|
|
|
/* wrong proxy type */
|
|
strcpy(line,"CMETHOD trebuchet dog 127.0.0.1:1999");
|
|
test_assert(parse_cmethod_line(line, mp) < 0);
|
|
|
|
reset_mp(mp);
|
|
|
|
/* wrong addrport */
|
|
strcpy(line,"CMETHOD trebuchet socks4 abcd");
|
|
test_assert(parse_cmethod_line(line, mp) < 0);
|
|
|
|
reset_mp(mp);
|
|
|
|
/* correct line */
|
|
strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999");
|
|
test_assert(parse_cmethod_line(line, mp) == 0);
|
|
test_assert(smartlist_len(mp->transports));
|
|
|
|
reset_mp(mp);
|
|
|
|
/* incomplete smethod */
|
|
strcpy(line,"SMETHOD trebuchet");
|
|
test_assert(parse_smethod_line(line, mp) < 0);
|
|
|
|
reset_mp(mp);
|
|
|
|
/* wrong addr type */
|
|
strcpy(line,"SMETHOD trebuchet abcd");
|
|
test_assert(parse_smethod_line(line, mp) < 0);
|
|
|
|
reset_mp(mp);
|
|
|
|
/* cowwect */
|
|
strcpy(line,"SMETHOD trebuchy 127.0.0.1:1999");
|
|
test_assert(parse_smethod_line(line, mp) == 0);
|
|
|
|
reset_mp(mp);
|
|
|
|
/* unsupported version */
|
|
strcpy(line,"VERSION 666");
|
|
test_assert(parse_version(line, mp) < 0);
|
|
|
|
/* incomplete VERSION */
|
|
strcpy(line,"VERSION ");
|
|
test_assert(parse_version(line, mp) < 0);
|
|
|
|
/* correct VERSION */
|
|
strcpy(line,"VERSION 1");
|
|
test_assert(parse_version(line, mp) == 0);
|
|
|
|
done:
|
|
tor_free(mp);
|
|
}
|
|
|
|
static void
|
|
test_pt_protocol(void)
|
|
{
|
|
char line[200];
|
|
|
|
managed_proxy_t *mp = tor_malloc_zero(sizeof(managed_proxy_t));
|
|
mp->conf_state = PT_PROTO_LAUNCHED;
|
|
mp->transports = smartlist_new();
|
|
|
|
/* various wrong protocol runs: */
|
|
|
|
strcpy(line, "TEST TEST");
|
|
handle_proxy_line(line, mp);
|
|
test_assert(mp->conf_state == PT_PROTO_BROKEN);
|
|
|
|
reset_mp(mp);
|
|
|
|
strcpy(line,"VERSION 1");
|
|
handle_proxy_line(line, mp);
|
|
test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS);
|
|
|
|
strcpy(line,"VERSION 1");
|
|
handle_proxy_line(line, mp);
|
|
test_assert(mp->conf_state == PT_PROTO_BROKEN);
|
|
|
|
reset_mp(mp);
|
|
|
|
strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999");
|
|
handle_proxy_line(line, mp);
|
|
test_assert(mp->conf_state == PT_PROTO_BROKEN);
|
|
|
|
reset_mp(mp);
|
|
|
|
/* correct protocol run: */
|
|
strcpy(line,"VERSION 1");
|
|
handle_proxy_line(line, mp);
|
|
test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS);
|
|
|
|
strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999");
|
|
handle_proxy_line(line, mp);
|
|
test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS);
|
|
|
|
strcpy(line,"CMETHODS DONE");
|
|
handle_proxy_line(line, mp);
|
|
test_assert(mp->conf_state == PT_PROTO_CONFIGURED);
|
|
|
|
done:
|
|
tor_free(mp);
|
|
}
|
|
|
|
#define PT_LEGACY(name) \
|
|
{ #name, legacy_test_helper, 0, &legacy_setup, test_pt_ ## name }
|
|
|
|
struct testcase_t pt_tests[] = {
|
|
PT_LEGACY(parsing),
|
|
PT_LEGACY(protocol),
|
|
END_OF_TESTCASES
|
|
};
|
|
|