add command line utilites for radius profiles
This commit is contained in:
1 parent
4f33d67418
commit
09238510ff
9 files changed
+693
-13
No files matched your search
+34
-2
@@ -338,7 +338,7 @@ class IPAClient:
|
||||
result = self.transport.get_radius_client_by_ip_addr(ip_addr, container, sattrs)
|
||||
return radius_util.RadiusClient(result)
|
||||
|
||||
def add_radius_client(self,client, container=None):
|
||||
def add_radius_client(self, client, container=None):
|
||||
client_dict = client.toDict()
|
||||
|
||||
# dn is set on the server-side
|
||||
@@ -348,7 +348,7 @@ class IPAClient:
|
||||
result = self.transport.add_radius_client(client_dict, container)
|
||||
return result
|
||||
|
||||
def update_radius_client(self,client):
|
||||
def update_radius_client(self, client):
|
||||
result = self.transport.update_radius_client(client.origDataDict(), client.toDict())
|
||||
return result
|
||||
|
||||
@@ -366,3 +366,35 @@ class IPAClient:
|
||||
|
||||
return users
|
||||
|
||||
def get_radius_profile_by_uid(self, uid, user_profile=None, sattrs=None):
|
||||
result = self.transport.get_radius_profile_by_uid(uid, user_profile, sattrs)
|
||||
return radius_util.RadiusClient(result)
|
||||
|
||||
def add_radius_profile(self, profile, user_profile=None):
|
||||
profile_dict = profile.toDict()
|
||||
|
||||
# dn is set on the server-side
|
||||
del profile_dict['dn']
|
||||
|
||||
# convert to a regular dict before sending
|
||||
result = self.transport.add_radius_profile(profile_dict, user_profile)
|
||||
return result
|
||||
|
||||
def update_radius_profile(self, profile):
|
||||
result = self.transport.update_radius_profile(profile.origDataDict(), profile.toDict())
|
||||
return result
|
||||
|
||||
def delete_radius_profile(self, ip_addr, user_profile=None):
|
||||
return self.transport.delete_radius_profile(ip_addr, user_profile)
|
||||
|
||||
def find_radius_profiles(self, criteria, user_profile=None, sattrs=None, searchlimit=0, timelimit=-1):
|
||||
result = self.transport.find_radius_profiles(criteria, user_profile, sattrs, searchlimit, timelimit)
|
||||
counter = result[0]
|
||||
|
||||
users = [counter]
|
||||
for attrs in result[1:]:
|
||||
if attrs is not None:
|
||||
users.append(user.User(attrs))
|
||||
|
||||
return users
|
||||
|
||||
@@ -140,7 +140,8 @@ radius_client_attr_to_ldap_attr = reverse_map_dict(radius_client_ldap_attr_to_ra
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
radius_profile_ldap_attr_to_radius_attr = {
|
||||
radius_profile_ldap_attr_to_radius_attr = ipautil.CIDict({
|
||||
'uid' : 'UID',
|
||||
'radiusArapFeatures' : 'Arap-Features',
|
||||
'radiusArapSecurity' : 'Arap-Security',
|
||||
'radiusArapZoneAccess' : 'Arap-Zone-Access',
|
||||
@@ -200,7 +201,7 @@ radius_profile_ldap_attr_to_radius_attr = {
|
||||
'radiusTunnelType' : 'Tunnel-Type',
|
||||
'radiusUserCategory' : 'User-Category',
|
||||
'radiusVSA' : 'VSA',
|
||||
}
|
||||
})
|
||||
|
||||
radius_profile_attr_to_ldap_attr = reverse_map_dict(radius_profile_ldap_attr_to_radius_attr)
|
||||
|
||||
|
||||
+73
-4
@@ -594,7 +594,7 @@ class RPCClient:
|
||||
|
||||
# radius support
|
||||
|
||||
def get_radius_client_by_ip_addr(self,ip_addr, container, sattrs=None):
|
||||
def get_radius_client_by_ip_addr(self, ip_addr, container, sattrs=None):
|
||||
server = self.setup_server()
|
||||
if container is None: container = "__NONE__"
|
||||
if sattrs is None: sattrs = "__NONE__"
|
||||
@@ -607,7 +607,7 @@ class RPCClient:
|
||||
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
def add_radius_client(self,client, container=None):
|
||||
def add_radius_client(self, client, container=None):
|
||||
server = self.setup_server()
|
||||
|
||||
if container is None: container = "__NONE__"
|
||||
@@ -621,7 +621,7 @@ class RPCClient:
|
||||
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
def update_radius_client(self,oldclient,newclient):
|
||||
def update_radius_client(self, oldclient, newclient):
|
||||
server = self.setup_server()
|
||||
|
||||
try:
|
||||
@@ -635,7 +635,7 @@ class RPCClient:
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
|
||||
def delete_radius_client(self,ip_addr, container=None):
|
||||
def delete_radius_client(self, ip_addr, container=None):
|
||||
server = self.setup_server()
|
||||
if container is None: container = "__NONE__"
|
||||
|
||||
@@ -663,3 +663,72 @@ class RPCClient:
|
||||
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
def get_radius_profile_by_uid(self, ip_addr, user_profile, sattrs=None):
|
||||
server = self.setup_server()
|
||||
if user_profile is None: user_profile = "__NONE__"
|
||||
if sattrs is None: sattrs = "__NONE__"
|
||||
try:
|
||||
result = server.get_radius_profile_by_uid(ip_addr, user_profile, sattrs)
|
||||
except xmlrpclib.Fault, fault:
|
||||
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
|
||||
except socket.error, (value, msg):
|
||||
raise xmlrpclib.Fault(value, msg)
|
||||
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
def add_radius_profile(self, profile, user_profile=None):
|
||||
server = self.setup_server()
|
||||
|
||||
if user_profile is None: user_profile = "__NONE__"
|
||||
|
||||
try:
|
||||
result = server.add_radius_profile(ipautil.wrap_binary_data(profile), user_profile)
|
||||
except xmlrpclib.Fault, fault:
|
||||
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
|
||||
except socket.error, (value, msg):
|
||||
raise xmlrpclib.Fault(value, msg)
|
||||
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
def update_radius_profile(self, oldprofile, newprofile):
|
||||
server = self.setup_server()
|
||||
|
||||
try:
|
||||
result = server.update_radius_profile(ipautil.wrap_binary_data(oldprofile),
|
||||
ipautil.wrap_binary_data(newprofile))
|
||||
except xmlrpclib.Fault, fault:
|
||||
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
|
||||
except socket.error, (value, msg):
|
||||
raise xmlrpclib.Fault(value, msg)
|
||||
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
|
||||
def delete_radius_profile(self, ip_addr, user_profile=None):
|
||||
server = self.setup_server()
|
||||
if user_profile is None: user_profile = "__NONE__"
|
||||
|
||||
try:
|
||||
result = server.delete_radius_profile(ip_addr, user_profile)
|
||||
except xmlrpclib.Fault, fault:
|
||||
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
|
||||
except socket.error, (value, msg):
|
||||
raise xmlrpclib.Fault(value, msg)
|
||||
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
def find_radius_profiles(self, criteria, user_profile=None, sattrs=None, searchlimit=0, timelimit=-1):
|
||||
server = self.setup_server()
|
||||
if user_profile is None: user_profile = "__NONE__"
|
||||
try:
|
||||
# None values are not allowed in XML-RPC
|
||||
if sattrs is None:
|
||||
sattrs = "__NONE__"
|
||||
result = server.find_radius_profiles(criteria, user_profile, sattrs, searchlimit, timelimit)
|
||||
except xmlrpclib.Fault, fault:
|
||||
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
|
||||
except socket.error, (value, msg):
|
||||
raise xmlrpclib.Fault(value, msg)
|
||||
|
||||
return ipautil.unwrap_binary_data(result)
|
||||
|
||||
Reference in new issue
Block a user