From patchwork Sat Jun 15 02:24:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3731 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:a68e:b0:57d:b2cb:6cf with SMTP id hn14csp556371mab; Fri, 14 Jun 2024 19:25:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXxMEKLW/hUHb+oXQTLxwGt7h6ceQki0Opn7bSA0wsLTSMsbdfoga4LcGi5z78ME//kIcE4He7y49QdUYX+ZbhufjuzaM= X-Google-Smtp-Source: AGHT+IHFXhzKPRm7/9kYk6yDyGfE8GJxzn3CUoic/g71+8f44QCNuOu0nDLy/6aL0Ib+8q+T6G3i X-Received: by 2002:a05:6358:c391:b0:1a1:cc04:1dfe with SMTP id e5c5f4694b2df-1a1cc041f7amr35174355d.2.1718418332870; Fri, 14 Jun 2024 19:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718418332; cv=none; d=google.com; s=arc-20160816; b=mVgqBBNKtvRjok7C7+apZofYM6XD3zUiilm7BBiScuPk1O2P+R0zvD+pTZKXUttmG+ sE4iktu4b8/vKw+KqvPuvgxOuycpc/SfPNW+i5zdtEGb/pjlc5WA1lMpMbwFkpvVM4hi sWb3EHm/o/u0WlRsfSTOfs5zZWbWR+MJO2xvHZGhUUJVF+mz1LyQR4nLGLZtp8bBoRCI BryznaIPIIK74bGW/NzaBA65RKuqsez+TxFgFAzXWobrdyd9q3nX2zztU/PuyJhdBmHI Ukz0h1ph3E0tUPzTGXQ96tTKKW0NX/4TpWXBVz06AR9WgnAD7zGRXZDQhOvsflpEwjz5 AwZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=vfBUpGEKlWICmD1sCdZh4bVDzhg1CDEEyfNImtQRSL4=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=Rmz3FP+S/mgDAzzYuE7wkL1KvQE7K8/3L5Z+Bf3/Qi2keLueRiTB0rg533yuXBB8rQ dpm1XhxEJKgpsNnEmYEJs650f1vSSa1Og7S/CxxAV+e5trVYEWdmihHjUgEAlBqvwnFm CUyj/jLhVcdwRT24v1B7pTxInKRaIzo8zTBNiV6j9RCJ1rOKgLrOFa7BYfkK9C1KU0ek VUp52RozAViFj2ZtK4XzFflyFnv+E+rCTYBwuFoy0lQqumDBUskdkI90V9rqaEWUiWxj NMlT/L+8GX0W9kf6GYISlJgbtZgL49HziH28zLEo5nG6tpdrMwO4nhlSb+ZNfnRs6B2r LBrQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=VN3quid+; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=aERGIT9I; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=CLiMrxB1; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 41be03b00d2f7-6fee67b9858si4554709a12.857.2024.06.14.19.25.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jun 2024 19:25:32 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=VN3quid+; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=aERGIT9I; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=CLiMrxB1; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1sIJ6K-0002cX-4c; Sat, 15 Jun 2024 02:25:08 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1sIJ6I-0002cI-OF for openvpn-devel@lists.sourceforge.net; Sat, 15 Jun 2024 02:25:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QbVR0TW9SGegaDyHo/tYRhryT0KKNOFt8HsqtNOIrR4=; b=VN3quid+iwUPLtt2cufpQfbxdV KImtDMAuYD3t4LJYQF/xvPeFW7XuC9cWhB71JmeGUVvMgGPfvXZ2jhm5h/n3WIvdFTN6FnFcgyXgz /WksNm/aAzqn8qQBfenStgnUHdTv5Y1bySZcNV3YSsTSxkyLftuQHNvtMLAEbcjKPC/E=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=QbVR0TW9SGegaDyHo/tYRhryT0KKNOFt8HsqtNOIrR4=; b=a ERGIT9IcQIeLkETvtJ0PVK5iy6s27tt2lRjLwKuE7VhYAB7wjstg78ccOZPG4Lx/RSoj7DCWxXKA5 HJIvKDAdjpeG0fnw4sGp6R7sEjvLVlEyhw05aObm8tyJSj/MhQIMR59sL0RdcSO3UVffE0+SANKpt /jiBUPWnXsJhPlas=; Received: from mail-wm1-f41.google.com ([209.85.128.41]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1sIJ6I-0000FZ-Vs for openvpn-devel@lists.sourceforge.net; Sat, 15 Jun 2024 02:25:06 +0000 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4218008c613so22146055e9.2 for ; Fri, 14 Jun 2024 19:25:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1718418295; x=1719023095; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=QbVR0TW9SGegaDyHo/tYRhryT0KKNOFt8HsqtNOIrR4=; b=CLiMrxB1GTJRrl20GT9oN0eJK8WQaRSFwFkQ1ZOnyAx95LKg/BBTE7EkMOno46WXAG ArVdiVlkCpvCUHstOopCMUh4wk6/ppj90MAMrn54GQTaWi9OUT+L6XyYzZK7GY/qQvLn 3PQyW7mPnDC+zCsrHYZExCihZ+WJBKYoqZSRQNy3+jF6CPdZiRbSTz926+T3YvYXANuQ AzLDDbI0G8F/1BYjPoLQMW0neOdeddSCobgETm4sEl2C/o+h621MtUH8OZbAFoDw1Mre Zwjl9jK10HaW20mDdMmYDO/odu1tWjChkpS3lGf78gltCLnB6+L3Mx5QNXawUEKavZcw c+fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718418295; x=1719023095; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QbVR0TW9SGegaDyHo/tYRhryT0KKNOFt8HsqtNOIrR4=; b=R6ONFd48C1Efx0W5Za886E39FojIPXtWBCOJN7m3qoBwGk5QM9g6c3eoW9PSDZHlSe KU6S6C7P+dW83W/nvHud8uDStPl8msn13OZL3YGa6kDuuYUrfXi5a+EhbIAhbuqAubNL SfZkluKZdX99r1RUrP4cHZx3dVFbdHDntGJnyOAq8t3N8K3+qvxbXDgly7IaxASh5Eq1 t4MKRtVszu6U53+PesERgELEQbT6MkKYVrOYj6xCBu4Lqu8grjnDn4ARBJ70aSaKGiZk 0q6z9WM5QY1m7E7ijeJzlrtdazzCoXthfCAMo7Xytj3tY/DVhbibdcZKC05mdE/CSKYz riPA== X-Gm-Message-State: AOJu0YyFUYJbsDuW+TkyNo8MMDYpBUklXKgC2zvkiujPp3wJI8ivyTnG yTkjjnRqSTQ+JL70N/J21EUBvY6glFC1JZ/K+oGvc7mQP9bsZSxT2G96DkKdRMA= X-Received: by 2002:a05:600c:1d1b:b0:422:97d:43d4 with SMTP id 5b1f17b1804b1-42304d7fe07mr32044675e9.6.1718418294670; Fri, 14 Jun 2024 19:24:54 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42286fe92c6sm118457885e9.18.2024.06.14.19.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jun 2024 19:24:54 -0700 (PDT) From: "selvanair (Code Review)" X-Google-Original-From: "selvanair (Code Review)" X-Gerrit-PatchSet: 1 Date: Sat, 15 Jun 2024 02:24:53 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I41f6c1f7acb58f30fc4db0e32505018f64fcad28 X-Gerrit-Change-Number: 666 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: c8b5351639a066957d9d8f4bc38fb58243b8a5a5 References: Message-ID: <485c814b727094012dc7fd722f2548456c331221-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -5.2 (-----) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-5.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.128.41 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.128.41 listed in bl.score.senderscore.com] -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [209.85.128.41 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.41 listed in wl.mailspike.net] 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1sIJ6I-0000FZ-Vs Subject: [Openvpn-devel] [S] Change in openvpn[master]: Add test for static-challenge concatenation option 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: , Reply-To: selva.nair@gmail.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1801892221682357528?= X-GMAIL-MSGID: =?utf-8?q?1801892221682357528?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/666?usp=email to review the following change. Change subject: Add test for static-challenge concatenation option ...................................................................... Add test for static-challenge concatenation option Change-Id: I41f6c1f7acb58f30fc4db0e32505018f64fcad28 --- M tests/unit_tests/openvpn/test_user_pass.c 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/66/666/1 diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/openvpn/test_user_pass.c index b43e655..35fe60d 100644 --- a/tests/unit_tests/openvpn/test_user_pass.c +++ b/tests/unit_tests/openvpn/test_user_pass.c @@ -311,7 +311,25 @@ reset_user_pass(&up); - flags |= GET_USER_PASS_INLINE_CREDS; + flags |= GET_USER_PASS_STATIC_CHALLENGE_CONCAT; + + expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT Username:"); + will_return(query_user_exec_builtin, "c1user"); + expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT Password:"); + will_return(query_user_exec_builtin, "c1password"); + will_return(query_user_exec_builtin, true); + expect_string(query_user_exec_builtin, query_user[i].prompt, "CHALLENGE: Please enter token PIN"); + will_return(query_user_exec_builtin, "0123456"); + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, NULL, "UT", flags, challenge)); + assert_true(up.defined); + assert_string_equal(up.username, "c1user"); + /* password and response concatenated */ + assert_string_equal(up.password, "c1password0123456"); + + reset_user_pass(&up); + + flags = GET_USER_PASS_STATIC_CHALLENGE|GET_USER_PASS_INLINE_CREDS; /*FIXME: query_user_exec() called even though nothing queued */ will_return(query_user_exec_builtin, true);