IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

UnsafeIPAddress: Implement __(g|s)etstate__ and to ensure proper (un)pickling

Browse Source 
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

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
David Kupka 2016-10-06 13:31:52 +02:00 committed by Martin Basti
parent 71f642f751
commit fb85230e25
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ipapython/ipautil.py
View File

@ -125,6 +125,17 @@ class UnsafeIPAddress(netaddr.IPAddress):
super(UnsafeIPAddress, self).__init__(addr, super(UnsafeIPAddress, self).__init__(addr,
flags=self.netaddr_ip_flags) flags=self.netaddr_ip_flags)
def __getstate__(self):
state = {
'_net': self._net,
'super_state': super(UnsafeIPAddress, self).__getstate__(),
}
return state
def __setstate__(self, state):
super(UnsafeIPAddress, self).__setstate__(state['super_state'])
self._net = state['_net']
class CheckedIPAddress(UnsafeIPAddress): class CheckedIPAddress(UnsafeIPAddress):
"""IPv4 or IPv6 address with additional constraints. """IPv4 or IPv6 address with additional constraints.
@ -203,6 +214,17 @@ class CheckedIPAddress(UnsafeIPAddress):
self.prefixlen = self._net.prefixlen self.prefixlen = self._net.prefixlen
def __getstate__(self):
state = {
'prefixlen': self.prefixlen,
'super_state': super(CheckedIPAddress, self).__getstate__(),
}
return state
def __setstate__(self, state):
super(CheckedIPAddress, self).__setstate__(state['super_state'])
self.prefixlen = state['prefixlen']
def is_network_addr(self): def is_network_addr(self):
return self == self._net.network return self == self._net.network