From 38286be4353cbb76a6d1ead3ff3601b294d46c89 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Fri, 29 Oct 2010 12:43:28 +0000 Subject: quota compliance testing for https --- src/transport/Makefile.am | 16 ++- src/transport/test_quota_compliance.c | 7 +- .../test_quota_compliance_https_peer1.conf | 114 +++++++++++++++++++++ .../test_quota_compliance_https_peer2.conf | 114 +++++++++++++++++++++ 4 files changed, 246 insertions(+), 5 deletions(-) create mode 100644 src/transport/test_quota_compliance_https_peer1.conf create mode 100644 src/transport/test_quota_compliance_https_peer2.conf diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 067e882a2..fbda1c614 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -202,7 +202,8 @@ check_PROGRAMS = \ $(HTTP_REL_TEST) \ $(HTTPS_REL_TEST) \ test_quota_compliance_tcp \ - test_quota_compliance_http + test_quota_compliance_http \ + test_quota_compliance_https # TODO: add tests for nat, etc. if !DISABLE_TEST_RUN @@ -220,7 +221,8 @@ TESTS = \ $(HTTP_REL_TEST) \ $(HTTPS_REL_TEST) \ test_quota_compliance_tcp \ - test_quota_compliance_http + test_quota_compliance_http \ + test_quota_compliance_https endif test_transport_api_tcp_SOURCES = \ @@ -319,6 +321,12 @@ test_quota_compliance_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la +test_quota_compliance_https_SOURCES = \ + test_quota_compliance.c +test_quota_compliance_https_LDADD = \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/util/libgnunetutil.la + endif EXTRA_DIST = \ @@ -346,4 +354,6 @@ EXTRA_DIST = \ test_quota_compliance_tcp_peer1.conf \ test_quota_compliance_tcp_peer2.conf \ test_quota_compliance_http_peer1.conf \ - test_quota_compliance_http_peer2.conf \ No newline at end of file + test_quota_compliance_http_peer2.conf \ + test_quota_compliance_https_peer1.conf \ + test_quota_compliance_https_peer2.conf \ No newline at end of file diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 0c5acbdc3..2a4a97265 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c @@ -593,8 +593,11 @@ run (void *cls, } else if (is_https) { - setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf"); - setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "is_https: %u \n", + is_https); + setup_peer (&p1, "test_quota_compliance_https_peer1.conf"); + setup_peer (&p2, "test_quota_compliance_https_peer2.conf"); } else if (is_udp) { diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf new file mode 100644 index 000000000..b2c4ea9f2 --- /dev/null +++ b/src/transport/test_quota_compliance_https_peer1.conf @@ -0,0 +1,114 @@ +[PATHS] +SERVICEHOME = /tmp/test_quota_compliance_peer1/ +DEFAULTCONFIG = test_quota_compliance_https_peer1.conf + +[fs] +AUTOSTART = NO + +[datastore] +AUTOSTART = NO + +[hostlist] +HTTP-PROXY = +SERVERS = http://gnunet.org:8080/ +OPTIONS = -b +BINARY = gnunet-daemon-hostlist +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +HTTPPORT = 8080 + +[topology] +BINARY = gnunet-daemon-topology +CONFIG = $DEFAULTCONFIG +FRIENDS = $SERVICEHOME/friends +TARGET-CONNECTION-COUNT = 16 +AUTOCONNECT = YES +FRIENDS-ONLY = NO +MINIMUM-FRIENDS = 0 + +[core] +AUTOSTART = NO + +[transport-https] +PORT = 4001 +#DEBUG = YES +USE_IPv4 = YES +USE_IPv6 = NO +BINDTO4 = 127.0.0.1 +#BINDTO6 = ::1 +KEY_FILE = https_key_p1.key +CERT_FILE = https_cert_p1.crt +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL +#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL +#CRYPTO_INIT = PERFORMANCE + + +[transport] +plugins = https +#DEBUG = YES +PREFIX = +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +NEIGHBOUR_LIMIT = 50 +BINARY = gnunet-service-transport +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 4091 +UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_transport_peer1.sock + +[peerinfo] +TRUST = $SERVICEHOME/data/credit/ +HOSTS = $SERVICEHOME/data/hosts/ +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-peerinfo +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 4090 +UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_peerinfo_peer1.sock + +[resolver] +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-resolver +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 4089 +UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_resolver_peer1.sock + +[statistics] +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-statistics +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 4088 +UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_statistics_peer1.sock + +[arm] +DEFAULTSERVICES = +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-arm +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 4087 +UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_arm_peer1.sock + +[TESTING] +WEAKRANDOM = YES + +[gnunetd] +HOSTKEY = $SERVICEHOME/.hostkey + + +[dht] +AUTOSTART = NO + + diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf new file mode 100644 index 000000000..bf9debcf0 --- /dev/null +++ b/src/transport/test_quota_compliance_https_peer2.conf @@ -0,0 +1,114 @@ +[PATHS] +SERVICEHOME = /tmp/test_quota_compliance_peer2 +DEFAULTCONFIG = test_quota_compliance_https_peer2.conf + +[transport-https] +PORT = 3001 +#DEBUG = YES +USE_IPv4 = YES +USE_IPv6 = NO +BINDTO4 = 127.0.0.1 +#BINDTO6 = ::1 +KEY_FILE = https_key_p1.key +CERT_FILE = https_cert_p1.crt +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL +#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL +#CRYPTO_INIT = PERFORMANCE + + +[fs] +AUTOSTART = NO + +[datastore] +AUTOSTART = NO + +[hostlist] +HTTP-PROXY = +SERVERS = http://gnunet.org:8080/ +OPTIONS = -b +BINARY = gnunet-daemon-hostlist +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +HTTPPORT = 8080 + +[topology] +BINARY = gnunet-daemon-topology +CONFIG = $DEFAULTCONFIG +FRIENDS = $SERVICEHOME/friends +TARGET-CONNECTION-COUNT = 16 +AUTOCONNECT = YES +FRIENDS-ONLY = NO +MINIMUM-FRIENDS = 0 + +[core] +AUTOSTART = NO + +[transport] +plugins = https +#DEBUG = YES +PREFIX = +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +NEIGHBOUR_LIMIT = 50 +BINARY = gnunet-service-transport +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 3091 +UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_transport_peer2.sock + +[peerinfo] +TRUST = $SERVICEHOME/data/credit/ +HOSTS = $SERVICEHOME/data/hosts/ +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-peerinfo +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 3090 +UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_peerinfo_peer2.sock + +[resolver] +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-resolver +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 3089 +UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_resolver_peer2.sock + +[statistics] +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-statistics +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 3088 +UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_statistics_peer2.sock + +[arm] +DEFAULTSERVICES = +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-arm +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 3087 +UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock + +[TESTING] +WEAKRANDOM = YES + +[gnunetd] +HOSTKEY = $SERVICEHOME/.hostkey + + +[dht] +AUTOSTART = NO + + -- cgit v1.2.3