From patchwork Tue Jul 3 04:47:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 393 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id E69+A8aWO1teLQAAIUCqbw for ; Tue, 03 Jul 2018 11:31:18 -0400 Received: from proxy20.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net (Dovecot) with LMTP id 7SJXAsaWO1v9EQAAfY0hYg ; Tue, 03 Jul 2018 11:31:18 -0400 Received: from smtp40.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy20.mail.ord1d.rsapps.net with LMTP id WJabAsaWO1syYAAAsk8m8w ; Tue, 03 Jul 2018 11:31:18 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp40.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 205f1162-7ed6-11e8-9e08-525400f204c2-1-1 Received: from [216.105.38.7] ([216.105.38.7:39976] helo=lists.sourceforge.net) by smtp40.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AF/0A-16229-5C69B3B5; Tue, 03 Jul 2018 11:31:17 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1faNFx-0007TO-3J; Tue, 03 Jul 2018 15:30:17 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1faNFt-0007TF-J1 for openvpn-devel@lists.sourceforge.net; Tue, 03 Jul 2018 15:30:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DzCY0p1IKwzx/9NvQK0y70JuiSh3UWNgYtfcELQ7GnE=; b=LiJEHjGXbB8cw0olWvO5jPakAi p1WgC4Z1qHhG4dpXGsEr0FQ0Ix1BT9yishYeujFaSvztRI4deHwUBC2bTg46gegWfJ9UbNKTtECiL O+SJJMUeU8sdJJeoNizHwXQt3phCZ1GRCIm8VP+4jpdX11nUAXAaYZH3PmlCxVil3/y0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=DzCY0p1IKwzx/9NvQK0y70JuiSh3UWNgYtfcELQ7GnE=; b=Uof59UtuAyb13HjTIH0KQBSN94 PANL4Qq6TKOvTwIHzVCVMnBt3ZPLHhcNylc/NPgDlKQb3kgfKkDd2Z32+YRdZaZtoUigYocRIjF4Z K1F3hexT16230uC/tg6nDu4gI6Wndtb5G4kEGBt9+WASzbly2tWKJfq55vvjMHQDR++c=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1faNFq-00FnYq-5K for openvpn-devel@lists.sourceforge.net; Tue, 03 Jul 2018 15:30:13 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.91 (FreeBSD)) (envelope-from ) id 1faMax-000JCh-Ta for openvpn-devel@lists.sourceforge.net; Tue, 03 Jul 2018 16:47:55 +0200 Received: (nullmailer pid 6838 invoked by uid 10006); Tue, 03 Jul 2018 14:47:55 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 3 Jul 2018 16:47:55 +0200 Message-Id: <20180703144755.6794-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different X-Headers-End: 1faNFq-00FnYq-5K Subject: [Openvpn-devel] [PATCH] Implement parsing and sending INFO and INFO_PRE control messages X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox OpenVPN 3 implements these messages to send information during the authentication to the UI, implement these message also in OpenVPN 2.x --- src/openvpn/forward.c | 8 ++++++++ src/openvpn/push.c | 29 +++++++++++++++++++++++++++++ src/openvpn/push.h | 2 ++ 3 files changed, 39 insertions(+) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 9905b5a0..d3e6eede 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -169,6 +169,14 @@ check_incoming_control_channel_dowork(struct context *c) { server_pushed_signal(c, &buf, false, 4); } + else if (buf_string_match_head_str(&buf, "INFO_PRE")) + { + server_pushed_info(c, &buf, 8); + } + else if (buf_string_match_head_str(&buf, "INFO")) + { + server_pushed_info(c, &buf, 4); + } else { msg(D_PUSH_ERRORS, "WARNING: Received unknown control message: %s", BSTR(&buf)); diff --git a/src/openvpn/push.c b/src/openvpn/push.c index d1ca84d1..069a32c4 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -175,6 +175,34 @@ server_pushed_signal(struct context *c, const struct buffer *buffer, const bool } } +void server_pushed_info(struct context *c, const struct buffer *buffer, const int adv) +{ + struct gc_arena gc; + const char *m = ""; + struct buffer buf = *buffer; + + if (buf_advance(&buf, adv) && buf_read_u8(&buf) == ',' && BLEN(&buf)) + { + m = BSTR(&buf); + } + + #ifdef ENABLE_MANAGEMENT + if (management) + { + gc = gc_new(); + + /* We use >INFOMSG here instead of plain >INFO since INFO is used to */ + /* for management greeting and we don't want to confuse the client */ + struct buffer out = alloc_buf_gc(256, &gc); + buf_printf(&out, ">%s:%s", "INFOMSG", m); + management_notify_generic(management, BSTR(&out)); + + gc_free(&gc); + } + #endif + msg(D_PUSH, "Info command was pushed by server ('%s')", m); +} + #if P2MP_SERVER /** * Add an option to the given push list by providing a format string. diff --git a/src/openvpn/push.h b/src/openvpn/push.h index 5f6181e7..acc94003 100644 --- a/src/openvpn/push.h +++ b/src/openvpn/push.h @@ -50,6 +50,8 @@ void receive_auth_failed(struct context *c, const struct buffer *buffer); void server_pushed_signal(struct context *c, const struct buffer *buffer, const bool restart, const int adv); +void server_pushed_info(struct context *c, const struct buffer *buffer, const int adv); + void incoming_push_message(struct context *c, const struct buffer *buffer); #if P2MP_SERVER