Page MenuHomeVyOS Platform
Files F118306298

No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/python/vyos/base.py b/python/vyos/base.py
index fd22eaccd..78067d5b2 100644
--- a/python/vyos/base.py
+++ b/python/vyos/base.py
@@ -1,29 +1,35 @@
-# Copyright 2018-2021 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2018-2022 VyOS maintainers and contributors <maintainers@vyos.io>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library. If not, see <http://www.gnu.org/licenses/>.
from textwrap import fill
+class Warning():
+ def __init__(self, message):
+ # Reformat the message and trim it to 72 characters in length
+ message = fill(message, width=72)
+ print(f'\nWARNING: {message}')
+
class DeprecationWarning():
def __init__(self, message):
# Reformat the message and trim it to 72 characters in length
message = fill(message, width=72)
print(f'\nDEPRECATION WARNING: {message}\n')
class ConfigError(Exception):
def __init__(self, message):
# Reformat the message and trim it to 72 characters in length
message = fill(message, width=72)
# Call the base class constructor with the parameters it needs
super().__init__(message)
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py
index 1ecc09d34..00b889a11 100755
--- a/src/conf_mode/salt-minion.py
+++ b/src/conf_mode/salt-minion.py
@@ -1,117 +1,121 @@
#!/usr/bin/env python3
#
# Copyright (C) 2018-2022 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
from socket import gethostname
from sys import exit
from urllib3 import PoolManager
+from vyos.base import Warning
from vyos.config import Config
from vyos.configdict import dict_merge
from vyos.configverify import verify_interface_exists
from vyos.template import render
from vyos.util import call
from vyos.util import chown
from vyos.xml import defaults
from vyos import ConfigError
from vyos import airbag
airbag.enable()
config_file = r'/etc/salt/minion'
master_keyfile = r'/opt/vyatta/etc/config/salt/pki/minion/master_sign.pub'
user='minion'
group='vyattacfg'
def get_config(config=None):
if config:
conf = config
else:
conf = Config()
base = ['service', 'salt-minion']
if not conf.exists(base):
return None
salt = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
# ID default is dynamic thus we can not use defaults()
if 'id' not in salt:
salt['id'] = gethostname()
# We have gathered the dict representation of the CLI, but there are default
# options which we need to update into the dictionary retrived.
default_values = defaults(base)
salt = dict_merge(default_values, salt)
if not conf.exists(base):
return None
else:
conf.set_level(base)
return salt
def verify(salt):
if not salt:
return None
+ if 'hash' in salt and salt['hash'] == 'sha1':
+ Warning('Do not use sha1 hashing algorithm, upgrade to sha256 or later!')
+
if 'source_interface' in salt:
verify_interface_exists(salt['source_interface'])
return None
def generate(salt):
if not salt:
return None
render(config_file, 'salt-minion/minion.j2', salt, user=user, group=group)
if not os.path.exists(master_keyfile):
if 'master_key' in salt:
req = PoolManager().request('GET', salt['master_key'], preload_content=False)
with open(master_keyfile, 'wb') as f:
while True:
data = req.read(1024)
if not data:
break
f.write(data)
req.release_conn()
chown(master_keyfile, user, group)
return None
def apply(salt):
service_name = 'salt-minion.service'
if not salt:
# Salt removed from running config
call(f'systemctl stop {service_name}')
if os.path.exists(config_file):
os.unlink(config_file)
else:
call(f'systemctl restart {service_name}')
return None
if __name__ == '__main__':
try:
c = get_config()
verify(c)
generate(c)
apply(c)
except ConfigError as e:
print(e)
exit(1)

File Metadata

Mime Type
text/x-diff
Expires
Sat, Oct 17, 12:14 AM (1 d, 23 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4416479
Default Alt Text
(5 KB)

Event Timeline