From patchwork Thu Jul 5 23:29:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akhouderchah@chromium.org X-Patchwork-Id: 940361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Z1JkwNia"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="KJ3y7SdO"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41MVFp1nbXz9s1B for ; Fri, 6 Jul 2018 19:45:18 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=aT4DQR7fXTelvahkWWPSvagthgk8HidbCMx9YAWmBI0=; b=Z1JkwNiay+xg2os6ooRSqnrH+n k48LxGYAw3jwJP5SYjxymgExYvVkXXfJb+6r5J8yFUOyj7/s6kGa4GEdH9BNyY+R7wD1FNMIEFoJ1 MTegnokFpVQ0c/it4SQiwfpZEk7g4ROpxIUE6TmCcVbGX0pQ5kCvEvFC/i9kiIyE2jaf2fXBHAFsp x5wXjcoRmGBQYXtFnrxQ46bwDeQD2nXpXotJIFuB+8cnejuB8otERw1bu/Yka3UH4O9SYahTTN3RA BwoEv2DYECWJpNXkTDZrWEaq/TAEmMkQapjWUKVke2jj3vIZvYV4UfKJXSe6KkDza/SQQOpwQ5kJH kWjjNeTQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fbNIR-0002WC-Al; Fri, 06 Jul 2018 09:44:59 +0000 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fbDhL-00049d-1M for hostap@lists.infradead.org; Thu, 05 Jul 2018 23:30:04 +0000 Received: by mail-pl0-x243.google.com with SMTP id 30-v6so1941483pld.13 for ; Thu, 05 Jul 2018 16:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vm32o8c0oTQ9BQRNBieBXq7Ityc0BUiEYUriRVKi6d0=; b=KJ3y7SdOrnRpzADEn6PjcmnyshHzCo0o4ZvYHoA9+JifhP5phQbsDoceLeySCTuROh w5STreALKErVUd0O9lBZe1zV2nWjbdvqDvLqyUfiscUSxFNedbWKg3KAo2EiJ+XE6E+V Mep4EGkrsBMH00KO93TWfHqwLD7bIbTYy8QLA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Vm32o8c0oTQ9BQRNBieBXq7Ityc0BUiEYUriRVKi6d0=; b=MH3iqf3JoMtP2gGvrOPUyMQO6OX8l+NSR87AaCjTzvmdVUfFTlfBjXpJrA4w3EP8F2 CZcbeVsRfRaut2cO/OdzrM5C/wYr33QPwXWAm7iSpp5U8BqbZMshtf2FHp1LCgi8KwfZ DgaUhncWLROfmHVow0HRs8yjwbEopnVRdk+8q43CKHZ3SYlRl2QeTr+1cZzcLCR5P384 LBbrsXKEwuX3RWcq3wq34/l/ShARjpF7+1D6GfPEu1ZWRXN+Db9aM6E7WB7tQ/Dxkzt2 k9SiHWxbS/8FjqiqSOQppjmX+IJ6vSlWl33+ydYWGe4OXpTgU5RVYUAWSqH+l9MNB0Ft lFag== X-Gm-Message-State: APt69E1kaCj76Tc1pu4nLpHgW7uJIgqix3DHwBOpaT5tZlIGZW+TJfnN 4GRiYhEVb7fyYanvBsIVr04urHGS1JA= X-Google-Smtp-Source: AAOMgpcrNfVxcq7jv0TWET9Vgp12XBFwgGtiAGbaaN8TeGQDBu+ApsBxM5VftknpPtP39Uug2b/srQ== X-Received: by 2002:a17:902:6903:: with SMTP id j3-v6mr7905851plk.313.1530833391975; Thu, 05 Jul 2018 16:29:51 -0700 (PDT) Received: from akhouderchah.mtv.corp.google.com ([2620:0:1000:1511:965b:9cd2:6c20:46f0]) by smtp.gmail.com with ESMTPSA id s22-v6sm12262642pgs.34.2018.07.05.16.29.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 16:29:51 -0700 (PDT) From: akhouderchah@chromium.org To: j@w1.fi Subject: [PATCH v2] dbus: Expose authentication status to D-Bus Date: Thu, 5 Jul 2018 16:29:09 -0700 Message-Id: <20180705232909.219417-1-akhouderchah@chromium.org> X-Mailer: git-send-email 2.18.0.203.gfac676dfb9-goog In-Reply-To: <20180703002924.119226-1-akhouderchah@chromium.org> References: <20180703002924.119226-1-akhouderchah@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180705_163003_122343_84362CF5 X-CRM114-Status: GOOD ( 16.43 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c01:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Mailman-Approved-At: Fri, 06 Jul 2018 02:44:45 -0700 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: akhouderchah@chromium.org, hostap@lists.infradead.org MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Alex Khouderchah wpa_supplicant currently logs CTRL-EVENT-AUTH-FAILED errors when authentication fails, but doesn't expose any property to the D-Bus interface related to this. This change adds the "AuthStatusCode" property to the interface, which contains the IEEE 802.11 status code of the last authentication. Signed-off-by: Alex Khouderchah --- doc/dbus.doxygen | 5 +++++ wpa_supplicant/dbus/dbus_new.c | 9 +++++++++ wpa_supplicant/dbus/dbus_new.h | 1 + wpa_supplicant/dbus/dbus_new_handlers.c | 21 +++++++++++++++++++++ wpa_supplicant/dbus/dbus_new_handlers.h | 1 + wpa_supplicant/events.c | 2 ++ wpa_supplicant/notify.c | 9 +++++++++ wpa_supplicant/notify.h | 1 + wpa_supplicant/wpa_supplicant_i.h | 3 +++ 9 files changed, 52 insertions(+) diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen index 2ca40ae9b..4e54333d0 100644 --- a/doc/dbus.doxygen +++ b/doc/dbus.doxygen @@ -764,6 +764,11 @@ fi.w1.wpa_supplicant1.CreateInterface.

The most recent IEEE 802.11 reason code for disconnect. Negative value indicates locally generated disconnection.

+
  • +

    AuthStatusCode - i - (read)

    +

    The most recent IEEE 802.11 status code for authentication.

    +
    • +

  • AssocStatusCode - i - (read)

    The most recent IEEE 802.11 status code for association rejection.

    diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index e0f16bbda..b8e9154a9 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -2158,6 +2158,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, prop = "DisconnectReason"; flush = TRUE; break; + case WPAS_DBUS_PROP_AUTH_STATUS_CODE: + prop = "AuthStatusCode"; + flush = TRUE; + break; case WPAS_DBUS_PROP_ASSOC_STATUS_CODE: prop = "AssocStatusCode"; flush = TRUE; @@ -3484,6 +3488,11 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = { NULL, NULL }, + { "AuthStatusCode", WPAS_DBUS_NEW_IFACE_INTERFACE, "i", + wpas_dbus_getter_auth_status_code, + NULL, + NULL + }, { "AssocStatusCode", WPAS_DBUS_NEW_IFACE_INTERFACE, "i", wpas_dbus_getter_assoc_status_code, NULL, diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h index e68acb7a1..8f17a3148 100644 --- a/wpa_supplicant/dbus/dbus_new.h +++ b/wpa_supplicant/dbus/dbus_new.h @@ -30,6 +30,7 @@ enum wpas_dbus_prop { WPAS_DBUS_PROP_CURRENT_AUTH_MODE, WPAS_DBUS_PROP_BSSS, WPAS_DBUS_PROP_DISCONNECT_REASON, + WPAS_DBUS_PROP_AUTH_STATUS_CODE, WPAS_DBUS_PROP_ASSOC_STATUS_CODE, }; diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index a3c98fadd..45bddef8b 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -3137,6 +3137,27 @@ dbus_bool_t wpas_dbus_getter_disconnect_reason( } +/** + * wpas_dbus_getter_auth_status_code - Get most recent auth status code + * @iter: Pointer to incoming dbus message iter + * @error: Location to store error on failure + * @user_data: Function specific data + * Returns: TRUE on success, FALSE on failure + * + * Getter for "AuthStatusCode" property. + */ +dbus_bool_t wpas_dbus_getter_auth_status_code( + const struct wpa_dbus_property_desc *property_desc, + DBusMessageIter *iter, DBusError *error, void *user_data) +{ + struct wpa_supplicant *wpa_s = user_data; + dbus_int32_t reason = wpa_s->auth_status_code; + + return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_INT32, + &reason, error); +} + + /** * wpas_dbus_getter_assoc_status_code - Get most recent failed assoc status code * @iter: Pointer to incoming dbus message iter diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h index 26652ad3d..1483c2132 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.h +++ b/wpa_supplicant/dbus/dbus_new_handlers.h @@ -147,6 +147,7 @@ DECLARE_ACCESSOR(wpas_dbus_getter_fast_reauth); DECLARE_ACCESSOR(wpas_dbus_setter_fast_reauth); DECLARE_ACCESSOR(wpas_dbus_getter_disconnect_reason); DECLARE_ACCESSOR(wpas_dbus_getter_disassociate_reason); +DECLARE_ACCESSOR(wpas_dbus_getter_auth_status_code); DECLARE_ACCESSOR(wpas_dbus_getter_assoc_status_code); DECLARE_ACCESSOR(wpas_dbus_getter_bss_expire_age); DECLARE_ACCESSOR(wpas_dbus_setter_bss_expire_age); diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index fb77f1dbd..6dc865e56 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -4027,6 +4027,8 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, "FST: MB IEs updated from auth IE"); #endif /* CONFIG_FST */ sme_event_auth(wpa_s, data); + wpa_s->auth_status_code = data->auth.status_code; + wpas_notify_auth_status_code(wpa_s); break; case EVENT_ASSOC: #ifdef CONFIG_TESTING_OPTIONS diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index 83df04f39..6afcd47ad 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -140,6 +140,15 @@ void wpas_notify_disconnect_reason(struct wpa_supplicant *wpa_s) } +void wpas_notify_auth_status_code(struct wpa_supplicant *wpa_s) +{ + if (wpa_s->p2p_mgmt) + return; + + wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_AUTH_STATUS_CODE); +} + + void wpas_notify_assoc_status_code(struct wpa_supplicant *wpa_s) { if (wpa_s->p2p_mgmt) diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h index 3ca933c76..9801c2818 100644 --- a/wpa_supplicant/notify.h +++ b/wpa_supplicant/notify.h @@ -23,6 +23,7 @@ void wpas_notify_state_changed(struct wpa_supplicant *wpa_s, enum wpa_states new_state, enum wpa_states old_state); void wpas_notify_disconnect_reason(struct wpa_supplicant *wpa_s); +void wpas_notify_auth_status_code(struct wpa_supplicant *wpa_s); void wpas_notify_assoc_status_code(struct wpa_supplicant *wpa_s); void wpas_notify_network_changed(struct wpa_supplicant *wpa_s); void wpas_notify_ap_scan_changed(struct wpa_supplicant *wpa_s); diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 2b0dca0ef..8efba3f70 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -1014,6 +1014,9 @@ struct wpa_supplicant { /* WLAN_REASON_* reason codes. Negative if locally generated. */ int disconnect_reason; + /* WLAN_STATUS_* status codes from Authentication Response frame. */ + u16 auth_status_code; + /* WLAN_STATUS_* status codes from (Re)Association Response frame. */ u16 assoc_status_code;