PORTREVISION=	1

--- cloudinit/config/cc_set_passwords.py.orig	2019-07-17 16:30:07 UTC

+++ cloudinit/config/cc_set_passwords.py

@@ -153,71 +153,31 @@ def handle(_name, cfg, cloud, log, args):

         else:

             log.warn("No default or defined user to change password for.")

-    errors = []

+    random_msg = (

+        "Set the following 'random' password:\n"

+        "  '%s' to %s")

+

     if plist:

-        plist_in = []

-        hashed_plist_in = []

-        hashed_users = []

-        randlist = []

         users = []

         prog = re.compile(r'\$(1|2a|2y|5|6)(\$.+){2}')

         for line in plist:

             u, p = line.split(':', 1)

+            log.debug("Setting password for: %s" % u)

             if prog.match(p) is not None and ":" not in p:

-                hashed_plist_in.append("%s:%s" % (u, p))

-                hashed_users.append(u)

-            else:

-                if p == "R" or p == "RANDOM":

+                cloud.distro.set_passwd(u, p, hashed=True)

+            elif p == "R" or p == "RANDOM":

                     p = rand_user_password()

-                    randlist.append("%s:%s" % (u, p))

-                plist_in.append("%s:%s" % (u, p))

-                users.append(u)

+                    sys.stderr.write(random_msg % (p, u))

+                    cloud.distro.set_passwd(u, p)

+            else:

+                cloud.distro.set_passwd(u, p)

-        ch_in = '\n'.join(plist_in) + '\n'

-        if users:

-            try:

-                log.debug("Changing password for %s:", users)

-                util.subp(['chpasswd'], ch_in)

-            except Exception as e:

-                errors.append(e)

-                util.logexc(

-                    log, "Failed to set passwords with chpasswd for %s", users)

+            if expire:

+                cloud.distro.force_passwd_change(u)

-        hashed_ch_in = '\n'.join(hashed_plist_in) + '\n'

-        if hashed_users:

-            try:

-                log.debug("Setting hashed password for %s:", hashed_users)

-                util.subp(['chpasswd', '-e'], hashed_ch_in)

-            except Exception as e:

-                errors.append(e)

-                util.logexc(

-                    log, "Failed to set hashed passwords with chpasswd for %s",

-                    hashed_users)

-

-        if len(randlist):

-            blurb = ("Set the following 'random' passwords\n",

-                     '\n'.join(randlist))

-            sys.stderr.write("%s\n%s\n" % blurb)

-

-        if expire:

-            expired_users = []

-            for u in users:

-                try:

-                    util.subp(['passwd', '--expire', u])

-                    expired_users.append(u)

-                except Exception as e:

-                    errors.append(e)

-                    util.logexc(log, "Failed to set 'expire' for %s", u)

-            if expired_users:

-                log.debug("Expired passwords for: %s users", expired_users)

-

     handle_ssh_pwauth(

         cfg.get('ssh_pwauth'), service_cmd=cloud.distro.init_cmd,

         service_name=cloud.distro.get_option('ssh_svcname', 'ssh'))

-

-    if len(errors):

-        log.debug("%s errors occured, re-raising the last one", len(errors))

-        raise errors[-1]

 def rand_user_password(pwlen=9):

--- cloudinit/config/tests/test_set_passwords.py.orig	2019-07-17 16:30:07 UTC

+++ cloudinit/config/tests/test_set_passwords.py

@@ -101,11 +101,18 @@ class TestSetPasswordsHandle(CiTestCase):

             'DEBUG: Handling input for chpasswd as list.',

             self.logs.getvalue())

         self.assertIn(

-            "DEBUG: Setting hashed password for ['root', 'ubuntu']",

+            "DEBUG: Setting password for: root",

             self.logs.getvalue())

-        self.assertEqual(

-            [mock.call(['chpasswd', '-e'],

-             '\n'.join(valid_hashed_pwds) + '\n')],

+        self.assertIn(

+            "DEBUG: Setting password for: ubuntu",

+            self.logs.getvalue())

+        self.assertEqual([

+            mock.call(['chpasswd', '-e'], valid_hashed_pwds[0],

+                      logstring='chpasswd for root'),

+            mock.call(['passwd', '--expire', 'root']),

+            mock.call(['chpasswd', '-e'], valid_hashed_pwds[1],

+                      logstring='chpasswd for ubuntu'),

+            mock.call(['passwd', '--expire', 'ubuntu'])],

             m_subp.call_args_list)

 # vi: ts=4 expandtab

--- cloudinit/distros/__init__.py.orig	2019-09-05 10:12:03 UTC

+++ cloudinit/distros/__init__.py

@@ -591,7 +591,7 @@ class Distro(object):

             util.logexc(LOG, 'Failed to disable password for user %s', name)

             raise e

-    def set_passwd(self, user, passwd, hashed=False):

+    def set_passwd(self, user, passwd, hashed=False, force_change=False):

         pass_string = '%s:%s' % (user, passwd)

         cmd = ['chpasswd']

@@ -606,8 +606,17 @@ class Distro(object):

         except Exception as e:

             util.logexc(LOG, "Failed to set password for %s", user)

             raise e

-

         return True

+

+    def force_passwd_change(self, user):

+        """

+        The users will have to enter a new password the first time they log in

+        """

+        try:

+            util.subp(['passwd', '--expire', user])

+        except Exception as e:

+            util.logexc(LOG, "Failed to set pw expiration for %s", user)

+            raise e

     def ensure_sudo_dir(self, path, sudo_base='/etc/sudoers'):

         # Ensure the dir is included and that

--- cloudinit/distros/freebsd.py.orig	2019-09-05 10:12:03 UTC

+++ cloudinit/distros/freebsd.py

@@ -136,7 +136,7 @@ class Distro(distros.Distro):

         if passwd_val is not None:

             self.set_passwd(name, passwd_val, hashed=True)

-    def set_passwd(self, user, passwd, hashed=False):

+    def set_passwd(self, user, passwd, hashed=False, force_change=False):

         if hashed:

             hash_opt = "-H"

         else:

@@ -147,6 +147,13 @@ class Distro(distros.Distro):

                       data=passwd, logstring="chpasswd for %s" % user)

         except Exception as e:

             util.logexc(LOG, "Failed to set password for %s", user)

+            raise e

+

+    def force_passwd_change(self, user):

+        try:

+            util.subp(['pw', 'usermod', user, '-p', '01-Jan-1970'])

+        except Exception as e:

+            util.logexc(LOG, "Failed to set pw expiration for %s", user)

             raise e

     def lock_passwd(self, name):

--- cloudinit/net/__init__.py.orig	2019-07-17 16:30:07 UTC

+++ cloudinit/net/__init__.py

@@ -585,6 +585,27 @@ def get_ib_interface_hwaddr(ifname, ethernet_format):

 def get_interfaces_by_mac():

+    if util.is_FreeBSD():

+        return get_interfaces_by_mac_on_freebsd()

+    else:

+        return get_interfaces_by_mac_on_linux()

+

+

+def get_interfaces_by_mac_on_freebsd():

+    ret = {}

+    (out, _) = util.subp(['ifconfig', '-a'])

+    blocks = re.split(r'(^\S+|\n\S+):', out)

+    blocks.reverse()

+    blocks.pop()  # Ignore the first one

+    while blocks:

+        ifname = blocks.pop()

+        m = re.search(r'ether\s([\da-f:]{17})', blocks.pop())

+        if m and m.group(1):

+            ret[m.group(1)] = ifname

+    return ret

+

+

+def get_interfaces_by_mac_on_linux():

     """Build a dictionary of tuples {mac: name}.

     Bridges and any devices that have a 'stolen' mac are excluded."""

--- cloudinit/net/freebsd.py.orig	2019-09-05 10:12:03 UTC

+++ cloudinit/net/freebsd.py

@@ -0,0 +1,124 @@

+# This file is part of cloud-init. See LICENSE file for license information.

+

+import re

+

+from cloudinit import log as logging

+from cloudinit import net

+from cloudinit import util

+from cloudinit.distros import rhel_util

+from cloudinit.distros.parsers.resolv_conf import ResolvConf

+

+from . import renderer

+

+LOG = logging.getLogger(__name__)

+

+

+class Renderer(renderer.Renderer):

+    resolv_conf_fn = 'etc/resolv.conf'

+    rc_conf_fn = 'etc/rc.conf'

+

+    def __init__(self, config=None):

+        if not config:

+            config = {}

+        self.dhcp_interfaces = []

+        self._postcmds = config.get('postcmds', True)

+

+    def _render_route(self, route, indent=""):

+        pass

+

+    def _render_iface(self, iface, render_hwaddress=False):

+        pass

+

+    def _write_network(self, settings, target=None):

+        nameservers = []

+        searchdomains = []

+        ifname_by_mac = net.get_interfaces_by_mac()

+        for interface in settings.iter_interfaces():

+            device_name = interface.get("name")

+            device_mac = interface.get("mac_address")

+            if device_name:

+                if re.match(r'^lo\d+$', device_name):

+                    continue

+            if device_mac and device_name:

+                cur_name = ifname_by_mac[device_mac]

+                if not cur_name:

+                    LOG.info('Cannot find any device with MAC %s', device_mac)

+                    continue

+                if cur_name != device_name:

+                    rhel_util.update_sysconfig_file(

+                        util.target_path(target, self.rc_conf_fn), {

+                            'ifconfig_%s_name' % cur_name: device_name})

+            elif device_mac:

+                device_name = ifname_by_mac[device_mac]

+

+            subnet = interface.get("subnets", [])[0]

+            LOG.info('Configuring interface %s', device_name)

+

+            if subnet.get('type') == 'static':

+                LOG.debug('Configuring dev %s with %s / %s', device_name,

+                          subnet.get('address'), subnet.get('netmask'))

+                # Configure an ipv4 address.

+                ifconfig = (subnet.get('address') + ' netmask ' +

+                            subnet.get('netmask'))

+

+                # Configure the gateway.

+                rhel_util.update_sysconfig_file(

+                    util.target_path(target, self.rc_conf_fn), {

+                        'defaultrouter': subnet.get('gateway')})

+

+                if 'dns_nameservers' in subnet:

+                    nameservers.extend(subnet['dns_nameservers'])

+                if 'dns_search' in subnet:

+                    searchdomains.extend(subnet['dns_search'])

+            else:

+                self.dhcp_interfaces.append(device_name)

+                ifconfig = 'DHCP'

+

+            rhel_util.update_sysconfig_file(

+                util.target_path(target, self.rc_conf_fn), {

+                    'ifconfig_' + device_name: ifconfig})

+

+        # Try to read the /etc/resolv.conf or just start from scratch if that

+        # fails.

+        try:

+            resolvconf = ResolvConf(util.load_file(self.resolv_conf_fn))

+            resolvconf.parse()

+        except IOError:

+            util.logexc(LOG, "Failed to parse %s, use new empty file",

+                        self.resolv_conf_fn)

+            resolvconf = ResolvConf('')

+            resolvconf.parse()

+

+        # Add some nameservers

+        for server in nameservers:

+            try:

+                resolvconf.add_nameserver(server)

+            except ValueError:

+                util.logexc(LOG, "Failed to add nameserver %s", server)

+

+        # And add any searchdomains.

+        for domain in searchdomains:

+            try:

+                resolvconf.add_search_domain(domain)

+            except ValueError:

+                util.logexc(LOG, "Failed to add search domain %s", domain)

+        util.write_file(self.resolv_conf_fn, str(resolvconf), 0o644)

+        self.start_services()

+

+    def render_network_state(self, network_state, templates=None, target=None):

+        self._write_network(network_state, target=target)

+

+    def start_services(self):

+        if not self._postcmds:

+            LOG.debug("freebsd generate postcmd disabled")

+            return

+

+        util.subp(['service', 'netif', 'restart'], capture=True)

+        util.subp(['service', 'routing', 'restart'], capture=True)

+        for dhcp_interface in self.dhcp_interfaces:

+            util.subp(['service', 'dhclient', 'restart', dhcp_interface],

+                      capture=True)

+

+

+def available(target=None):

+    return util.is_FreeBSD()

--- cloudinit/net/renderers.py.orig	2019-07-17 16:30:07 UTC

+++ cloudinit/net/renderers.py

@@ -1,17 +1,19 @@

 # This file is part of cloud-init. See LICENSE file for license information.

 from . import eni

+from . import freebsd

 from . import netplan

 from . import RendererNotFoundError

 from . import sysconfig

 NAME_TO_RENDERER = {

     "eni": eni,

+    "freebsd": freebsd,

     "netplan": netplan,

     "sysconfig": sysconfig,

 }

-DEFAULT_PRIORITY = ["eni", "sysconfig", "netplan"]

+DEFAULT_PRIORITY = ["eni", "sysconfig", "netplan", "freebsd"]

 def search(priority=None, target=None, first=False):

--- doc/rtd/topics/network-config.rst.orig	2019-07-17 16:30:07 UTC

+++ doc/rtd/topics/network-config.rst

@@ -191,7 +191,7 @@ supplying an updated configuration in cloud-config. ::

   system_info:

     network:

-      renderers: ['netplan', 'eni', 'sysconfig']

+      renderers: ['netplan', 'eni', 'sysconfig', 'freebsd']

 Network Configuration Tools

--- tests/unittests/test_distros/test_netconfig.py.orig	2019-07-17 16:30:07 UTC

+++ tests/unittests/test_distros/test_netconfig.py

@@ -1,5 +1,6 @@

 # This file is part of cloud-init. See LICENSE file for license information.

+import copy

 import os

 from six import StringIO

 from textwrap import dedent

@@ -14,7 +15,7 @@ from cloudinit.distros.parsers.sys_conf import SysConf

 from cloudinit import helpers

 from cloudinit import settings

 from cloudinit.tests.helpers import (

-    FilesystemMockingTestCase, dir2dict, populate_dir)

+    FilesystemMockingTestCase, dir2dict)

 from cloudinit import util

@@ -213,128 +214,95 @@ class TestNetCfgDistroBase(FilesystemMockingTestCase):

             self.assertEqual(v, b2[k])

-class TestNetCfgDistroFreebsd(TestNetCfgDistroBase):

+class TestNetCfgDistroFreeBSD(TestNetCfgDistroBase):

-    frbsd_ifout = """\

-hn0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500

-        options=51b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,TSO4,LRO>

-        ether 00:15:5d:4c:73:00

-        inet6 fe80::215:5dff:fe4c:7300%hn0 prefixlen 64 scopeid 0x2

-        inet 10.156.76.127 netmask 0xfffffc00 broadcast 10.156.79.255

-        nd6 options=23<PERFORMNUD,ACCEPT_RTADV,AUTO_LINKLOCAL>

-        media: Ethernet autoselect (10Gbase-T <full-duplex>)

-        status: active

-"""

+    def setUp(self):

+        super(TestNetCfgDistroFreeBSD, self).setUp()

+        self.distro = self._get_distro('freebsd', renderers=['freebsd'])

-    @mock.patch('cloudinit.distros.freebsd.Distro.get_ifconfig_list')

-    @mock.patch('cloudinit.distros.freebsd.Distro.get_ifconfig_ifname_out')

-    def test_get_ip_nic_freebsd(self, ifname_out, iflist):

-        frbsd_distro = self._get_distro('freebsd')

-        iflist.return_value = "lo0 hn0"

-        ifname_out.return_value = self.frbsd_ifout

-        res = frbsd_distro.get_ipv4()

-        self.assertEqual(res, ['lo0', 'hn0'])

-        res = frbsd_distro.get_ipv6()

-        self.assertEqual(res, [])

+    def _apply_and_verify_freebsd(self, apply_fn, config, expected_cfgs=None,

+                                  bringup=False):

+        if not expected_cfgs:

+            raise ValueError('expected_cfg must not be None')

-    @mock.patch('cloudinit.distros.freebsd.Distro.get_ifconfig_ether')

-    @mock.patch('cloudinit.distros.freebsd.Distro.get_ifconfig_ifname_out')

-    @mock.patch('cloudinit.distros.freebsd.Distro.get_interface_mac')

-    def test_generate_fallback_config_freebsd(self, mac, ifname_out, if_ether):

-        frbsd_distro = self._get_distro('freebsd')

+        tmpd = None

+        with mock.patch('cloudinit.net.freebsd.available') as m_avail:

+            m_avail.return_value = True

+            with self.reRooted(tmpd) as tmpd:

+                util.ensure_dir('/etc')

+                util.ensure_file('/etc/rc.conf')

+                util.ensure_file('/etc/resolv.conf')

+                apply_fn(config, bringup)

-        if_ether.return_value = 'hn0'

-        ifname_out.return_value = self.frbsd_ifout

-        mac.return_value = '00:15:5d:4c:73:00'

-        res = frbsd_distro.generate_fallback_config()

-        self.assertIsNotNone(res)

+        results = dir2dict(tmpd)

+        for cfgpath, expected in expected_cfgs.items():

+            print("----------")

+            print(expected)

+            print("^^^^ expected | rendered VVVVVVV")

+            print(results[cfgpath])

+            print("----------")

+            self.assertEqual(

+                set(expected.split('\n')),

+                set(results[cfgpath].split('\n')))

+            self.assertEqual(0o644, get_mode(cfgpath, tmpd))

-    def test_simple_write_freebsd(self):

-        fbsd_distro = self._get_distro('freebsd')

+    @mock.patch('cloudinit.net.get_interfaces_by_mac')

+    def test_apply_network_config_freebsd_standard(self, ifaces_mac):

+        ifaces_mac.return_value = {

+            '00:15:5d:4c:73:00': 'eth0',

+        }

+        rc_conf_expected = """\

+defaultrouter=192.168.1.254

+ifconfig_eth0='192.168.1.5 netmask 255.255.255.0'

+ifconfig_eth1=DHCP

+"""

-        rc_conf = '/etc/rc.conf'

-        read_bufs = {

-            rc_conf: 'initial-rc-conf-not-validated',

-            '/etc/resolv.conf': 'initial-resolv-conf-not-validated',

+        expected_cfgs = {

+            '/etc/rc.conf': rc_conf_expected,

+            '/etc/resolv.conf': ''

         }

+        self._apply_and_verify_freebsd(self.distro.apply_network_config,

+                                       V1_NET_CFG,

+                                       expected_cfgs=expected_cfgs.copy())

-        tmpd = self.tmp_dir()

-        populate_dir(tmpd, read_bufs)

-        with self.reRooted(tmpd):

-            with mock.patch("cloudinit.distros.freebsd.util.subp",

-                            return_value=('vtnet0', '')):

-                fbsd_distro.apply_network(BASE_NET_CFG, False)

-                results = dir2dict(tmpd)

+    @mock.patch('cloudinit.net.get_interfaces_by_mac')

+    def test_apply_network_config_freebsd_ifrename(self, ifaces_mac):

+        ifaces_mac.return_value = {

+            '00:15:5d:4c:73:00': 'vtnet0',

+        }

+        rc_conf_expected = """\

+ifconfig_vtnet0_name=eth0

+defaultrouter=192.168.1.254

+ifconfig_eth0='192.168.1.5 netmask 255.255.255.0'

+ifconfig_eth1=DHCP

+"""

-        self.assertIn(rc_conf, results)

-        self.assertCfgEquals(

-            dedent('''\

-                ifconfig_vtnet0="192.168.1.5 netmask 255.255.255.0"

-                ifconfig_vtnet1="DHCP"

-                defaultrouter="192.168.1.254"

-                '''), results[rc_conf])

-        self.assertEqual(0o644, get_mode(rc_conf, tmpd))

+        V1_NET_CFG_RENAME = copy.deepcopy(V1_NET_CFG)

+        V1_NET_CFG_RENAME['config'][0]['mac_address'] = '00:15:5d:4c:73:00'

-    def test_simple_write_freebsd_from_v2eni(self):

-        fbsd_distro = self._get_distro('freebsd')

-

-        rc_conf = '/etc/rc.conf'

-        read_bufs = {

-            rc_conf: 'initial-rc-conf-not-validated',

-            '/etc/resolv.conf': 'initial-resolv-conf-not-validated',

+        expected_cfgs = {

+            '/etc/rc.conf': rc_conf_expected,

+            '/etc/resolv.conf': ''

         }

+        self._apply_and_verify_freebsd(self.distro.apply_network_config,

+                                       V1_NET_CFG_RENAME,

+                                       expected_cfgs=expected_cfgs.copy())

-        tmpd = self.tmp_dir()

-        populate_dir(tmpd, read_bufs)

-        with self.reRooted(tmpd):

-            with mock.patch("cloudinit.distros.freebsd.util.subp",

-                            return_value=('vtnet0', '')):

-                fbsd_distro.apply_network(BASE_NET_CFG_FROM_V2, False)

-                results = dir2dict(tmpd)

-

-        self.assertIn(rc_conf, results)

-        self.assertCfgEquals(

-            dedent('''\

-                ifconfig_vtnet0="192.168.1.5 netmask 255.255.255.0"

-                ifconfig_vtnet1="DHCP"

-                defaultrouter="192.168.1.254"

-                '''), results[rc_conf])

-        self.assertEqual(0o644, get_mode(rc_conf, tmpd))

-

-    def test_apply_network_config_fallback_freebsd(self):

-        fbsd_distro = self._get_distro('freebsd')

-

-        # a weak attempt to verify that we don't have an implementation

-        # of _write_network_config or apply_network_config in fbsd now,

-        # which would make this test not actually test the fallback.

-        self.assertRaises(

-            NotImplementedError, fbsd_distro._write_network_config,

-            BASE_NET_CFG)

-

-        # now run

-        mynetcfg = {

-            'config': [{"type": "physical", "name": "eth0",

-                        "mac_address": "c0:d6:9f:2c:e8:80",

-                        "subnets": [{"type": "dhcp"}]}],

-            'version': 1}

-

-        rc_conf = '/etc/rc.conf'

-        read_bufs = {

-            rc_conf: 'initial-rc-conf-not-validated',

-            '/etc/resolv.conf': 'initial-resolv-conf-not-validated',

+    @mock.patch('cloudinit.net.get_interfaces_by_mac')

+    def test_apply_network_config_freebsd_nameserver(self, ifaces_mac):

+        ifaces_mac.return_value = {

+            '00:15:5d:4c:73:00': 'eth0',

         }

-        tmpd = self.tmp_dir()

-        populate_dir(tmpd, read_bufs)

-        with self.reRooted(tmpd):

-            with mock.patch("cloudinit.distros.freebsd.util.subp",

-                            return_value=('vtnet0', '')):

-                fbsd_distro.apply_network_config(mynetcfg, bring_up=False)

-                results = dir2dict(tmpd)

-

-        self.assertIn(rc_conf, results)

-        self.assertCfgEquals('ifconfig_vtnet0="DHCP"', results[rc_conf])

-        self.assertEqual(0o644, get_mode(rc_conf, tmpd))

+        V1_NET_CFG_DNS = copy.deepcopy(V1_NET_CFG)

+        ns = ['1.2.3.4']

+        V1_NET_CFG_DNS['config'][0]['subnets'][0]['dns_nameservers'] = ns

+        expected_cfgs = {

+            '/etc/resolv.conf': 'nameserver 1.2.3.4\n'

+        }

+        self._apply_and_verify_freebsd(self.distro.apply_network_config,

+                                       V1_NET_CFG_DNS,

+                                       expected_cfgs=expected_cfgs.copy())

 class TestNetCfgDistroUbuntuEni(TestNetCfgDistroBase):

--- tools/build-on-freebsd.orig	2019-07-17 16:30:07 UTC

+++ tools/build-on-freebsd

@@ -18,7 +18,6 @@ py_prefix=$(${PYTHON} -c 'import sys; print("py%d%d" %

 depschecked=/tmp/c-i.dependencieschecked

 pkgs="

     bash

-    chpasswd

     dmidecode

     e2fsprogs

     $py_prefix-Jinja2