From patchwork Mon Mar 5 15:39:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 881547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c0c::23b; helo=mail-wr0-x23b.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbkok6xkakgqeuwojdfy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="WfxubnIa"; dkim-atps=neutral Received: from mail-wr0-x23b.google.com (mail-wr0-x23b.google.com [IPv6:2a00:1450:400c:c0c::23b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zw3zc5lS8z9s3p for ; Tue, 6 Mar 2018 02:41:31 +1100 (AEDT) Received: by mail-wr0-x23b.google.com with SMTP id q15sf11372735wra.22 for ; Mon, 05 Mar 2018 07:41:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1520264489; cv=pass; d=google.com; s=arc-20160816; b=ZP2IJWXGNN3TXh+fkARiAA5mIVuQvC44zSqszoeWGRWxJHrD7whSTieekGToOSZlZI ypODGqdZWasSkgpQdeO38ffiKN6poIvelNrq9IGDc4hm8Yg6i1lb9rcrBSrzAj59XRZO npCdTT8SawqRJJyfjyxCDdwdMbvouq8Kk7wMv8xYpVur/zB3VFfrZqbfxK99b2zihiMN fS8w13rRdfqWNwj3BoIwyjR7Z/wHh5ArDvhPU6khVdqENdMj1vEXJOYVY5Pq/9yLhCnq VodVKWcznY9QzyUUMQhf35l550GDs33F5Xmd4qp8Mhn+58m3dTlp3B6d2FusbnyzltPJ iMpw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=LwD4Y/CGP3SRGnsfj2N+R4VXoR7RigQ/ga+VhvVlY+0=; b=0jOVHR3G8cxycoFXE4SijAPb71XSH9ADGnUDTATNDUdUEJo9i/+moRA7MnkmA15WUp SA4Fu7iLarJ1pH0EmIwddtd+pHWcLCxX48YfTZELGHt/1z2JGmWS0jNZSQKEdzrdXnUf kOd/ZWGhqCyo1kvtU5X8f2IDQWqJ7RhHMzutTuo1xOtGDdo0I5uLwskFsbc1JOGv892Z 7efsNy//kWCo/NxeSIAUtMPidOd78vpCVAj8HNLHlG8IBsBEGqkx59UlR9jXAsIWHhm4 qHIQvfnGJoB17DdSenTmLI2f3gxQFZD2rzLdEkLWOkexhjnEsMNC11V1XNZpL6doa4Qt XIPg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=LwD4Y/CGP3SRGnsfj2N+R4VXoR7RigQ/ga+VhvVlY+0=; b=WfxubnIaF+2158w092+2W46mFSuuOfYcraC6MDzTfFHaJCFBzLKinnqPCiixr83P4C JHj5duaCGJT6q3TkGckclnlABOTQf0ueKcXWYaKSbTgqUFvVDZ37Wsdt0weSFDRyfwFa kDJrieGIKpJ3FrvGfuAj7dcrt/H1VWMFhe4+rkMSddvYuWGEQviRjY3l30oUySY/Y+4W Z6QGsvJ68fYPTAlUNypLLJGvDR31bWvis+8SxdS353Os+j+jCQijyO/PsFd6M6K11c/T H5bVOyENm5Xp4kwvE469CX41pJwD3v5d7vkGcAUB0xB/nx3KnDvf21eBKDq7Qeu9Hk8r Lqjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=LwD4Y/CGP3SRGnsfj2N+R4VXoR7RigQ/ga+VhvVlY+0=; b=BkT7dxrnsPwmneydFIzGP3mhl6H4dfrOICyXQBy4lyeDuWyfZdaMwbQtLWvqyNl9ye rO+vTiUZ3Za8nuyxSmKy/Nz4nF17fyOvEwLsKwwNHmq8hkU1Xbhe5KGt4J2l1ijZBRc1 mq40BnPx2+nvRKdU6Yt3660FTYiVo+4rg5WbAtvaNG0tDjaSs9VYYnNOvZsSxmuM/72y y77JOMXDxFRE4ElRylJE5RwNw3eW3hAKHilEdb5dIn3m3vrHVjU2LoOmEJWniQ9rN10Z zYuxVi/ER88+EdCIrrQoRf3j855cgN9UNf8VeXiLVSfWCLGmzq08DNhMMmXXiKqUBwdr lcjQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AElRT7FZ/19GAKbACHIqeD9ySOnTWBmrJ/7LxEM5rHiXBDlxt32Mgblg XPjx/nyt+v/ZjKqreTYwrMs= X-Google-Smtp-Source: AG47ELt7DJqXZUZUJTZoo1FZv+w9n6zjHzDVNiQHCP3ytm8aJfR5gBUmyTSs+bX3ETkZ/6BD5lPxnw== X-Received: by 10.28.15.138 with SMTP id 132mr38222wmp.4.1520264489507; Mon, 05 Mar 2018 07:41:29 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.80.133.197 with SMTP id q5ls8110461edh.1.gmail; Mon, 05 Mar 2018 07:41:28 -0800 (PST) X-Received: by 10.80.141.16 with SMTP id s16mr4448951eds.7.1520264488696; Mon, 05 Mar 2018 07:41:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520264488; cv=none; d=google.com; s=arc-20160816; b=PxXBcH8GWej1W/3fR6gEFzrhqp0MMfrX0o9QFOZ4wk4/OHfgxKsN98/sIBrb3i/DSI ZPo3IlmWWVJHXd7XXqYn4632n7GsO71p6RWDIvigixElA8ohxx3Tv0dDM8DUh0Y7gklI 3NyXGEK68Cl7AkcxH/qbcUp7E8/Fab1QgrBM6bKti4objtSVd8U8ybPtZmRuEBvuM+WU BG5dTBnFJj2Zu2sjVYRNR0ejoIUWmyHe90dtK8yjN/m05DfZSuE8UcCa5ZZm3i6vzVYX 7envzzja8O20w8tvKozuRGwLHF3oHv9zmtAyQvKblyzfvc3X6MTtbuuVOmuPpiEip9/i miHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=UgAf3bZo2SMiNCISmw4eXQgDpxnULf5Bncw6lHPkF8M=; b=NyMbgRTKLoZFWY7lCu4mCEOHAOp9DXeGqIEUXZgsnwEfpv9ZYhgo4PrWYFzvbv53R0 IWeAEQWk4zRgxVlnESdnwPy+zZGZ13kjY13xEqE6xAFrM1Vsla/tcEOSAnNX11DNoZRo Oc49WbIoGgILe9HrkZgoCNwHzADF27IUHpi5Dz145gD3ngbg3Vr1v8ZsmLoEPsyfYFR/ WMfDM1vIrzEQFpcqgmpOWa0DvahCgkWnTmgURJOU5K5PmMjJZLC92KwulrLe4ZPOW8SN b5HwPkZszGEF3oxjHEnVfcGbH2uyXGZ/OaFcRSWUETejEb35il+gdGTf5FGZuVtjfrcq +nKA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id g21si193169edj.5.2018.03.05.07.41.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 07:41:28 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w25FfS63002461 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 5 Mar 2018 16:41:28 +0100 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.202]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w25FfRYG022466; Mon, 5 Mar 2018 16:41:27 +0100 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH 1/8] channel_curl: add support for Basic Auth credentials Date: Mon, 5 Mar 2018 16:39:59 +0100 Message-Id: <20180305154006.18122-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.16.2 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Implement Basic Auth credentials support in channel_curl like commit 1243723 has done for the downloader only, in preparation to make the downloader use channel_curl. Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- corelib/channel_curl.c | 9 +++++++++ include/channel_curl.h | 1 + 2 files changed, 10 insertions(+) diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index 0dec551..a94243d 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -454,6 +454,15 @@ channel_op_res_t channel_set_options(channel_t *this, } } + if (channel_data->auth) { + if (curl_easy_setopt(channel_curl->handle, CURLOPT_USERPWD, + channel_data->auth) != CURLE_OK) { + ERROR("Basic Auth credentials could not be set."); + result = CHANNEL_EINIT; + goto cleanup; + } + } + cleanup: return result; } diff --git a/include/channel_curl.h b/include/channel_curl.h index 2133744..3af470a 100644 --- a/include/channel_curl.h +++ b/include/channel_curl.h @@ -30,6 +30,7 @@ typedef enum { typedef struct { char *url; + char *auth; char *json_string; json_object *json_reply; char *cafile;