URL: https://github.com/freeipa/freeipa/pull/142 Author: dkupka Title: #142: CheckedIPAddress: Implement __(g|s)etstate__ and to ensure proper (un)pickling Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/142/head:pr142 git checkout pr142
From 97fc739d3b970f367dfaf4c3e78ee457fc6db898 Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Thu, 6 Oct 2016 13:31:52 +0200 Subject: [PATCH] UnsafeIPAddress: Implement __(g|s)etstate__ and to ensure proper (un)pickling Missing attributes in instance created by pickle.load cause AttributeError in second part of ipa-server-install --external-ca. https://fedorahosted.org/freeipa/ticket/6385 --- ipapython/ipautil.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 41544a1..ee62437 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -85,6 +85,7 @@ class UnsafeIPAddress(netaddr.IPAddress): # will use the same function in IPv4/IPv6 conversions + be stricter # and don't allow IP addresses such as '1.1.1' in the same time netaddr_ip_flags = netaddr.INET_PTON + _pickle_attrs = ['_net'] def __init__(self, addr): if isinstance(addr, UnsafeIPAddress): @@ -127,12 +128,36 @@ def __init__(self, addr): super(UnsafeIPAddress, self).__init__(addr, flags=self.netaddr_ip_flags) + def __getstate__(self): + state = {attr: getattr(self, attr) for attr in self._pickle_attrs} + try: + state['super_state'] = super(UnsafeIPAddress, self).__getstate__() + except AttributeError: + # none of base classes implements custom pickling + pass + + return state + + def __setstate__(self, state): + try: + super_state = state.pop('super_state') + except KeyError: + # no state saved for base classes + pass + else: + super(UnsafeIPAddress, self).__setstate__(super_state) + + for attr in self._pickle_attrs: + setattr(self, attr, state[attr]) + class CheckedIPAddress(UnsafeIPAddress): """IPv4 or IPv6 address with additional constraints. Reserved or link-local addresses are never accepted. """ + _pickle_attrs = UnsafeIPAddress._pickle_attrs + ['prefixlen'] + def __init__(self, addr, match_local=False, parse_netmask=True, allow_loopback=False, allow_multicast=False): try: @@ -142,6 +167,7 @@ def __init__(self, addr, match_local=False, parse_netmask=True, if isinstance(addr, CheckedIPAddress): self.prefixlen = addr.prefixlen + self._net = addr._net return if not parse_netmask and self._net:
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
