1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 3 Jun 2018 19:28:18 +0200
Subject: [PATCH] system.repo: Debian: Use proxy for keyservers
Previously, when fetching GPG keys for APT keyring, either using
public key download & import (as for default repos) or via keyserver,
we relied on simple `curl` calls or passed it down to Salt aptpkg
module.
To be able to retrieve APT keys behind a proxy, one used to have to
configure the proxy for the Salt minion, which does not yet have
`no_proxy` support (either *all* or *no* traffic hits the proxy).
When `linux:system:proxy` http(s) proxies are set:
- no longer pass key configuration to Salt aptpkg (until it properly
supports `no_proxy`);
- handle all keys explicitly with `curl` and `apt-key`;
- set 'http(s)_proxy' env vars for `cmd.wait` calls;
If `linux:system:proxy` is not defined, the behavior is
unchanged for backwards compatibility.
NOTE: If present, per-repo proxies are also used for keyserver access.
system.repo: Fix conditions order for Debian proxy
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
linux/system/repo.sls | 71 +++++++++++++++++++++++++++++++++----------
1 file changed, 55 insertions(+), 16 deletions(-)
diff --git a/linux/system/repo.sls b/linux/system/repo.sls
index 8b93ecb..bbfbde3 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
@@ -5,9 +5,15 @@ linux_repo_prereq_pkgs:
pkg.installed:
- pkgs: {{ system.pkgs }}
+{%- set proxies = {'system': {}, 'repo': {}} %}
+
# global proxy setup
-{%- if system.proxy.get('pkg', {}).get('enabled', False) %}
{%- if grains.os_family == 'Debian' %}
+{%- if system.proxy.get('pkg', {}).get('enabled', False) %}
+
+{%- do proxies.system.update({'https': system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true)}) %}
+{%- do proxies.system.update({'http': system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true)}) %}
+{%- do proxies.system.update({'ftp': system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true)}) %}
/etc/apt/apt.conf.d/99proxies-salt:
file.managed:
@@ -15,9 +21,9 @@ linux_repo_prereq_pkgs:
- source: salt://linux/files/apt.conf.d_proxies
- defaults:
external_host: False
- https: {{ system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), true) }}
- http: {{ system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), true) }}
- ftp: {{ system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), true) }}
+ https: {{ proxies.system.https }}
+ http: {{ proxies.system.http }}
+ ftp: {{ proxies.system.ftp }}
{%- else %}
@@ -25,9 +31,6 @@ linux_repo_prereq_pkgs:
file.absent
{%- endif %}
-{%- endif %}
-
-{% set default_repos = {} %}
{%- if system.purge_repos|default(False) %}
@@ -38,6 +41,10 @@ purge_sources_list_d_repos:
{%- endif %}
+{%- endif %}
+
+{% set default_repos = {} %}
+
{%- for name, repo in system.repo.items() %}
{%- set name=repo.get('name', name) %}
{%- if grains.os_family == 'Debian' %}
@@ -45,16 +52,20 @@ purge_sources_list_d_repos:
# per repository proxy setup
{%- if repo.get('proxy', {}).get('enabled', False) %}
{%- set external_host = repo.proxy.get('host', None) or repo.source.split('/')[2] %}
+{%- 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)}) %}
+{%- 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)}) %}
+{%- 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)}) %}
/etc/apt/apt.conf.d/99proxies-salt-{{ name }}:
file.managed:
- template: jinja
- source: salt://linux/files/apt.conf.d_proxies
- defaults:
external_host: {{ external_host }}
- https: {{ repo.proxy.get('https', None) or system.proxy.get('pkg', {}).get('https', None) | default(system.proxy.get('https', None), True) }}
- http: {{ repo.proxy.get('http', None) or system.proxy.get('pkg', {}).get('http', None) | default(system.proxy.get('http', None), True) }}
- ftp: {{ repo.proxy.get('ftp', None) or system.proxy.get('pkg', {}).get('ftp', None) | default(system.proxy.get('ftp', None), True) }}
+ https: {{ proxies.repo.https }}
+ http: {{ proxies.repo.http }}
+ ftp: {{ proxies.repo.ftp }}
{%- else %}
+{%- do proxies.repo.update({'https': None, 'http': None, 'ftp': None}) %}
/etc/apt/apt.conf.d/99proxies-salt-{{ name }}:
file.absent
{%- endif %}
@@ -81,10 +92,8 @@ linux_repo_{{ name }}_pin:
linux_repo_{{ name }}_key:
cmd.run:
- - name: |
- echo "{{ repo.key | indent(12) }}" | apt-key add -
- - unless: |
- apt-key finger --with-colons | grep -qF $(echo "{{ repo.key| indent(12) }}" | gpg --with-fingerprint --with-colons | grep -E '^fpr')
+ - name: "echo '{{ repo.key | indent(12) }}' | apt-key add -"
+ - unless: "apt-key finger --with-colons | grep -qF $(echo '{{ repo.key| indent(12) }}' | gpg --with-fingerprint --with-colons | grep -E '^fpr')"
- require_in:
{%- if repo.get('default', False) %}
- file: default_repo_list
@@ -104,6 +113,13 @@ linux_repo_{{ name }}_key:
{% else %}
- pkgrepo: linux_repo_{{ name }}
{% endif %}
+ - env:
+{%- if proxies.repo.get('https', None) or proxies.system.get('https', None) %}
+ - https_proxy: {{ proxies.repo.get('https', None) or proxies.system.get('https', None) }}
+{%- endif %}
+{%- if proxies.repo.get('http', None) or proxies.system.get('http', None) %}
+ - http_proxy: {{ proxies.repo.get('http', None) or proxies.system.get('http', None) }}
+{%- endif %}
{%- endif %} {# 2 #}
@@ -114,6 +130,10 @@ linux_repo_{{ name }}_key:
{%- if repo.get('enabled', True) %}
+{%- set use_proxy = ( ( proxies.repo.get('https', None) or proxies.system.get('https', None) or
+ proxies.repo.get('http', None) or proxies.system.get('http', None) ) and
+ repo.key_id is defined and repo.key_server is defined ) %}
+
linux_repo_{{ name }}:
pkgrepo.managed:
{%- if repo.ppa is defined %}
@@ -126,10 +146,10 @@ linux_repo_{{ name }}:
{%- endif %}
- file: /etc/apt/sources.list.d/{{ name }}.list
- clean_file: {{ repo.clean|default(True) }}
- {%- if repo.key_id is defined %}
+ {%- if not use_proxy and repo.key_id is defined %}
- keyid: {{ repo.key_id }}
{%- endif %}
- {%- if repo.key_server is defined %}
+ {%- if not use_proxy and repo.key_server is defined %}
- keyserver: {{ repo.key_server }}
{%- endif %}
- consolidate: {{ repo.get('consolidate', False) }}
@@ -148,6 +168,25 @@ linux_repo_{{ name }}:
{%- endif %}
{%- endif %}
+{%- if use_proxy and repo.key_id is defined and repo.key_server is defined %}
+
+linux_repo_{{ name }}_key:
+ cmd.run:
+ - name: "apt-key adv --keyserver {{ repo.key_server }} --recv {{ repo.key_id }}"
+ - unless: 'test -e /etc/apt/sources.list.d/{{ name }}.list'
+ - require_in:
+ - pkgrepo: linux_repo_{{ name }}
+ - env:
+{%- if proxies.repo.get('https', None) or proxies.system.get('https', None) %}
+ - https_proxy: {{ proxies.repo.get('https', None) or proxies.system.get('https', None) }}
+{%- endif %}
+{%- if proxies.repo.get('http', None) or proxies.system.get('http', None) %}
+ - http_proxy: {{ proxies.repo.get('http', None) or proxies.system.get('http', None) }}
+{%- endif %}
+
+{%- endif %}
+
+{#- repo.enabled is false #}
{%- else %}
linux_repo_{{ name }}_absent:
|
