<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/21860">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utils.py: Add helper method to get type of address (FQDN, IPv4, IPv6)<br><br>The function takes address string as input, then validates it and returns the type.<br>Return: 0x00 (FQDN), 0x01 (IPv4), 0x02 (IPv6), None (Bad address format)<br><br>Change-Id: I0fabd4f17bbb11f6bb191c1a9e6276427f9d001f<br>---<br>M pySim/utils.py<br>1 file changed, 58 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 38cc580..c5a38d8 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -685,3 +685,61 @@</span><br><span> (rec_info['mcc'], rec_info['mnc'], rec_info['epdg_priority'], rec_info['epdg_fqdn_format'])</span><br><span> s += "\t%s # %s\n" % (rec_data, rec_str)</span><br><span> return s</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def get_addr_type(addr):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ Validates the given address and returns it's type (FQDN or IPv4 or IPv6)</span><br><span style="color: hsl(120, 100%, 40%);">+ Return: 0x00 (FQDN), 0x01 (IPv4), 0x02 (IPv6), None (Bad address argument given)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ TODO: Handle IPv6</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Empty address string</span><br><span style="color: hsl(120, 100%, 40%);">+ if not len(addr):</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ import sys</span><br><span style="color: hsl(120, 100%, 40%);">+ # Handle python3 and python2 - unicode</span><br><span style="color: hsl(120, 100%, 40%);">+ if sys.version_info[0] < 3:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_str = unicode(addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_str = addr</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_list = addr.split('.')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Check for IPv4/IPv6</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ import ipaddress</span><br><span style="color: hsl(120, 100%, 40%);">+ # Throws ValueError if addr is not correct</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa = ipaddress.ip_address(addr_str)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ipa.version == 4:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+ elif ipa.version == 6:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0x02</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ invalid_ipv4 = True</span><br><span style="color: hsl(120, 100%, 40%);">+ for i in addr_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Invalid IPv4 may qualify for a valid FQDN, so make check here</span><br><span style="color: hsl(120, 100%, 40%);">+ # e.g. 172.24.15.300</span><br><span style="color: hsl(120, 100%, 40%);">+ import re</span><br><span style="color: hsl(120, 100%, 40%);">+ if not re.match('^[0-9_]+$', i):</span><br><span style="color: hsl(120, 100%, 40%);">+ invalid_ipv4 = False</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if invalid_ipv4:</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fqdn_flag = True</span><br><span style="color: hsl(120, 100%, 40%);">+ for i in addr_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Only Alpha-numeric characters and hyphen - RFC 1035</span><br><span style="color: hsl(120, 100%, 40%);">+ import re</span><br><span style="color: hsl(120, 100%, 40%);">+ if not re.match("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)?$", i):</span><br><span style="color: hsl(120, 100%, 40%);">+ fqdn_flag = False</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # FQDN</span><br><span style="color: hsl(120, 100%, 40%);">+ if fqdn_flag:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0x00</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/21860">change 21860</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/21860"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0fabd4f17bbb11f6bb191c1a9e6276427f9d001f </div>
<div style="display:none"> Gerrit-Change-Number: 21860 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>