1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2018 Mirantis Inc., Enea AB and others.
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
10 Date: Sun, 3 Jun 2018 19:28:18 +0200
11 Subject: [PATCH] system.repo: Debian: Use proxy for keyservers
13 Previously, when fetching GPG keys for APT keyring, either using
14 public key download & import (as for default repos) or via keyserver,
15 we relied on simple `curl` calls or passed it down to Salt aptpkg
17 To be able to retrieve APT keys behind a proxy, one used to have to
18 configure the proxy for the Salt minion, which does not yet have
19 `no_proxy` support (either *all* or *no* traffic hits the proxy).
21 When `linux:system:proxy` http(s) proxies are set:
22 - no longer pass key configuration to Salt aptpkg (until it properly
24 - handle all keys explicitly with `curl` and `apt-key`;
25 - set 'http(s)_proxy' env vars for `cmd.wait` calls;
27 If `linux:system:proxy` is not defined, the behavior is
28 unchanged for backwards compatibility.
30 NOTE: If present, per-repo proxies are also used for keyserver access.
32 system.repo: Fix conditions order for Debian proxy
34 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
36 linux/system/repo.sls | 55 ++++++++++++++++++++++++++++++++++++-------
37 1 file changed, 47 insertions(+), 8 deletions(-)
39 diff --git a/linux/system/repo.sls b/linux/system/repo.sls
40 index 9664129..d9f567e 100644
41 --- a/linux/system/repo.sls
42 +++ b/linux/system/repo.sls
43 @@ -7,18 +7,27 @@ linux_repo_prereq_pkgs:
44 - pkgs: {{ system.pkgs }}
47 + {%- set proxies = {'system': {}, 'repo': {}} %}
50 {%- if grains.os_family == 'Debian' %}
52 {%- if system.proxy.get('pkg', {}).get('enabled', False) %}
54 + {%- do proxies.system.update({'https': system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true)}) %}
55 + {%- do proxies.system.update({'http': system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true)}) %}
56 + {%- do proxies.system.update({'ftp': system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true)}) %}
58 /etc/apt/apt.conf.d/99proxies-salt:
61 - source: salt://linux/files/apt.conf.d_proxies
64 - https: {{ system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true) }}
65 - http: {{ system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true) }}
66 - ftp: {{ system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true) }}
67 + https: {{ proxies.system.https }}
68 + http: {{ proxies.system.http }}
69 + ftp: {{ proxies.system.ftp }}
72 /etc/apt/apt.conf.d/99proxies-salt:
74 @@ -43,16 +52,20 @@ purge_sources_list_d_repos:
75 # per repository proxy setup
76 {%- if repo.get('proxy', {}).get('enabled', False) %}
77 {%- set external_host = repo.proxy.get('host', None) or repo.source.split('/')[2] %}
78 + {%- do proxies.repo.update({'https': repo.proxy.get('https', None) or system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true)}) %}
79 + {%- do proxies.repo.update({'http': repo.proxy.get('http', None) or system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true)}) %}
80 + {%- do proxies.repo.update({'ftp': repo.proxy.get('ftp', None) or system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true)}) %}
81 /etc/apt/apt.conf.d/99proxies-salt-{{ name }}:
84 - source: salt://linux/files/apt.conf.d_proxies
86 external_host: {{ external_host }}
87 - https: {{ repo.proxy.get('https', None) or system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), True) }}
88 - http: {{ repo.proxy.get('http', None) or system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), True) }}
89 - ftp: {{ repo.proxy.get('ftp', None) or system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), True) }}
90 + https: {{ proxies.repo.https }}
91 + http: {{ proxies.repo.http }}
92 + ftp: {{ proxies.repo.ftp }}
94 + {%- do proxies.repo.update({'https': None, 'http': None, 'ftp': None}) %}
95 /etc/apt/apt.conf.d/99proxies-salt-{{ name }}:
98 @@ -104,6 +117,13 @@ linux_repo_{{ name }}_key:
100 - pkgrepo: linux_repo_{{ name }}
103 + {%- if proxies.repo.get('https', None) or proxies.system.get('https', None) %}
104 + - https_proxy: {{ proxies.repo.get('https', None) or proxies.system.get('https', None) }}
106 + {%- if proxies.repo.get('http', None) or proxies.system.get('http', None) %}
107 + - http_proxy: {{ proxies.repo.get('http', None) or proxies.system.get('http', None) }}
111 {%- if repo.get('default', False) %}
112 @@ -111,6 +131,9 @@ linux_repo_{{ name }}_key:
115 {%- if repo.get('enabled', True) %}
116 + {%- set use_proxy = ( ( proxies.repo.get('https', None) or proxies.system.get('https', None) or
117 + proxies.repo.get('http', None) or proxies.system.get('http', None) ) and
118 + repo.key_id is defined and repo.key_server is defined ) %}
119 linux_repo_{{ name }}:
122 @@ -126,10 +149,10 @@ linux_repo_{{ name }}:
124 - file: /etc/apt/sources.list.d/{{ name }}.list
125 - clean_file: {{ repo.get('clean_file', True) }}
126 - {%- if repo.key_id is defined %}
127 + {%- if not use_proxy and repo.key_id is defined %}
128 - keyid: {{ repo.key_id }}
130 - {%- if repo.key_server is defined %}
131 + {%- if not use_proxy and repo.key_server is defined %}
132 - keyserver: {{ repo.key_server }}
134 {%- if repo.key_url is defined and (grains['saltversioninfo'] >= [2017, 7] or repo.key_url.startswith('salt://')) %}
135 @@ -143,6 +166,22 @@ linux_repo_{{ name }}:
136 - file: purge_sources_list_d_repos
139 + {%- if use_proxy and repo.key_id is defined and repo.key_server is defined %}
140 +linux_repo_{{ name }}_key:
142 + - name: "apt-key adv --keyserver {{ repo.key_server }} --recv {{ repo.key_id }}"
143 + - unless: 'test -e /etc/apt/sources.list.d/{{ name }}.list'
145 + - pkgrepo: linux_repo_{{ name }}
147 + {%- if proxies.repo.get('https', None) or proxies.system.get('https', None) %}
148 + - https_proxy: {{ proxies.repo.get('https', None) or proxies.system.get('https', None) }}
150 + {%- if proxies.repo.get('http', None) or proxies.system.get('http', None) %}
151 + - http_proxy: {{ proxies.repo.get('http', None) or proxies.system.get('http', None) }}
154 + {#- repo.enabled is false #}
156 linux_repo_{{ name }}: