aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni@codeaurora.org>2019-03-24 20:17:49 (GMT)
committerJouni Malinen <j@w1.fi>2019-04-22 18:08:59 (GMT)
commit5fbefcc64b8b163a7c8256f243fe85cd754ec02e (patch)
tree150f7f9dee252bb8720ea5da8db5ce098c897e66
parent2a5a0680862b7e1b4af75c5d10276298edc3b6a6 (diff)
downloadhostap-5fbefcc64b8b163a7c8256f243fe85cd754ec02e.zip
hostap-5fbefcc64b8b163a7c8256f243fe85cd754ec02e.tar.gz
hostap-5fbefcc64b8b163a7c8256f243fe85cd754ec02e.tar.bz2
tests: DPP over TCP using Controller/Relay
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-rw-r--r--tests/hwsim/test_dpp.py119
-rw-r--r--tests/hwsim/wpasupplicant.py7
2 files changed, 125 insertions, 1 deletions
diff --git a/tests/hwsim/test_dpp.py b/tests/hwsim/test_dpp.py
index 770b80e..da32164 100644
--- a/tests/hwsim/test_dpp.py
+++ b/tests/hwsim/test_dpp.py
@@ -4385,3 +4385,122 @@ def run_dpp_legacy_and_dpp_akm(dev, apdev):
dev[0].request("DISCONNECT")
dev[0].wait_disconnected()
+
+def test_dpp_controller_relay(dev, apdev, params):
+ """DPP Controller/Relay"""
+ try:
+ run_dpp_controller_relay(dev, apdev, params)
+ finally:
+ dev[0].set("dpp_config_processing", "0")
+ dev[1].request("DPP_CONTROLLER_STOP")
+
+def run_dpp_controller_relay(dev, apdev, params):
+ check_dpp_capab(dev[0])
+ check_dpp_capab(dev[1])
+ prefix = "dpp_controller_relay"
+ cap_lo = os.path.join(params['logdir'], prefix + ".lo.pcap")
+
+ cmd = subprocess.Popen(['tcpdump', '-p', '-U', '-i', 'lo',
+ '-w', cap_lo, '-s', '2000'],
+ stderr=open('/dev/null', 'w'))
+
+ # Controller
+ conf_id = dev[1].dpp_configurator_add()
+ dev[1].set("dpp_configurator_params",
+ " conf=sta-dpp configurator=%d" % conf_id)
+ id_c = dev[1].dpp_bootstrap_gen()
+ uri_c = dev[1].request("DPP_BOOTSTRAP_GET_URI %d" % id_c)
+ res = dev[1].request("DPP_BOOTSTRAP_INFO %d" % id_c)
+ pkhash = None
+ for line in res.splitlines():
+ name, value = line.split('=')
+ if name == "pkhash":
+ pkhash = value
+ break
+ if not pkhash:
+ raise Exception("Could not fetch public key hash from Controller")
+ if "OK" not in dev[1].request("DPP_CONTROLLER_START"):
+ raise Exception("Failed to start Controller")
+
+ # Relay
+ params = {"ssid": "unconfigured",
+ "channel": "6",
+ "dpp_controller": "ipaddr=127.0.0.1 pkhash=" + pkhash}
+ relay = hostapd.add_ap(apdev[1], params)
+ check_dpp_capab(relay)
+
+ # Enroll Relay to the network
+ # TODO: Do this over TCP once direct Enrollee-over-TCP case is supported
+ id_h = relay.dpp_bootstrap_gen(chan="81/6", mac=True)
+ uri_r = relay.request("DPP_BOOTSTRAP_GET_URI %d" % id_h)
+ dev[1].dpp_auth_init(uri=uri_r, conf="ap-dpp", configurator=conf_id)
+ wait_auth_success(relay, dev[1], configurator=dev[1], enrollee=relay)
+ update_hapd_config(relay)
+
+ # Initiate from Enrollee with broadcast DPP Authentication Request
+ dev[0].set("dpp_config_processing", "2")
+ dev[0].dpp_auth_init(uri=uri_c, role="enrollee")
+ wait_auth_success(dev[1], dev[0], configurator=dev[1], enrollee=dev[0],
+ allow_enrollee_failure=True,
+ allow_configurator_failure=True)
+ dev[0].wait_connected()
+
+ time.sleep(0.5)
+ cmd.terminate()
+
+def test_dpp_tcp(dev, apdev, params):
+ """DPP over TCP"""
+ prefix = "dpp_tcp"
+ cap_lo = os.path.join(params['logdir'], prefix + ".lo.pcap")
+ try:
+ run_dpp_tcp(dev, apdev, cap_lo)
+ finally:
+ dev[1].request("DPP_CONTROLLER_STOP")
+
+def test_dpp_tcp_port(dev, apdev, params):
+ """DPP over TCP and specified port"""
+ prefix = "dpp_tcp_port"
+ cap_lo = os.path.join(params['logdir'], prefix + ".lo.pcap")
+ try:
+ run_dpp_tcp(dev, apdev, cap_lo, port="23456")
+ finally:
+ dev[1].request("DPP_CONTROLLER_STOP")
+
+def run_dpp_tcp(dev, apdev, cap_lo, port=None):
+ check_dpp_capab(dev[0])
+ check_dpp_capab(dev[1])
+
+ cmd = subprocess.Popen(['tcpdump', '-p', '-U', '-i', 'lo',
+ '-w', cap_lo, '-s', '2000'],
+ stderr=open('/dev/null', 'w'))
+ time.sleep(1)
+
+ # Controller
+ conf_id = dev[1].dpp_configurator_add()
+ dev[1].set("dpp_configurator_params",
+ " conf=sta-dpp configurator=%d" % conf_id)
+ id_c = dev[1].dpp_bootstrap_gen()
+ uri_c = dev[1].request("DPP_BOOTSTRAP_GET_URI %d" % id_c)
+ res = dev[1].request("DPP_BOOTSTRAP_INFO %d" % id_c)
+ pkhash = None
+ for line in res.splitlines():
+ name, value = line.split('=')
+ if name == "pkhash":
+ pkhash = value
+ break
+ if not pkhash:
+ raise Exception("Could not fetch public key hash from Controller")
+ req = "DPP_CONTROLLER_START"
+ if port:
+ req += " tcp_port=" + port
+ if "OK" not in dev[1].request(req):
+ raise Exception("Failed to start Controller")
+
+ # Initiate from Enrollee with broadcast DPP Authentication Request
+ dev[0].dpp_auth_init(uri=uri_c, role="enrollee", tcp_addr="127.0.0.1",
+ tcp_port=port)
+ wait_auth_success(dev[1], dev[0], configurator=dev[1], enrollee=dev[0],
+ allow_enrollee_failure=True,
+ allow_configurator_failure=True)
+ time.sleep(0.5)
+ cmd.terminate()
diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py
index 3b9fd29..1543600 100644
--- a/tests/hwsim/wpasupplicant.py
+++ b/tests/hwsim/wpasupplicant.py
@@ -1449,7 +1449,8 @@ class WpaSupplicant:
def dpp_auth_init(self, peer=None, uri=None, conf=None, configurator=None,
extra=None, own=None, role=None, neg_freq=None,
- ssid=None, passphrase=None, expect_fail=False):
+ ssid=None, passphrase=None, expect_fail=False,
+ tcp_addr=None, tcp_port=None):
cmd = "DPP_AUTH_INIT"
if peer is None:
peer = self.dpp_qr_code(uri)
@@ -1470,6 +1471,10 @@ class WpaSupplicant:
cmd += " ssid=" + binascii.hexlify(ssid.encode()).decode()
if passphrase:
cmd += " pass=" + binascii.hexlify(passphrase.encode()).decode()
+ if tcp_addr:
+ cmd += " tcp_addr=" + tcp_addr
+ if tcp_port:
+ cmd += " tcp_port=" + tcp_port
res = self.request(cmd)
if expect_fail:
if "FAIL" not in res: