Repository :
http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
---------------------------------------------------------------
commit 006e250af841c95d9bfb3bccdc110cb575face83
Author: Thomas Woerner <twoerner(a)redhat.com>
Date: Wed Jan 28 16:22:31 2015 +0100
Further teets in test.py, output fixes
- New tests for getServiceSettings and getIcmpTypeSettings
- Reenabled authorizeAll
- output changes
---------------------------------------------------------------
libfirewall/src/test.py | 207 +++++++++++++++++++++++++++-------------------
1 files changed, 121 insertions(+), 86 deletions(-)
diff --git a/libfirewall/src/test.py b/libfirewall/src/test.py
index fe7c8eb..d157b47 100755
--- a/libfirewall/src/test.py
+++ b/libfirewall/src/test.py
@@ -4,123 +4,155 @@ from gi.repository import firewall
fw = firewall.Client()
-#fw.authorizeAll()
+print("Authorize All")
+fw.authorizeAll()
+print("\n-------------------------------------------------------------------------------\n")
+
+#print("Reload")
#fw.reload()
+#print("Complete Reload")
#fw.completeReload()
+#print("\n-------------------------------------------------------------------------------\n")
+
+#print("Runtime To Permanent")
#fw.runtimeToPermanent()
+#print("\n-------------------------------------------------------------------------------\n")
+
print("panic mode: %s" % fw.queryPanicMode())
#fw.enablePanicMode()
#print(fw.queryPanicMode())
#fw.disablePanicMode()
#print(fw.queryPanicMode())
-print("-------------------------------------------------------------------------------\n")
-print("default zone: '%s'" % fw.getDefaultZone())
+print("\n-------------------------------------------------------------------------------\n")
+
+default_zone = fw.getDefaultZone()
+print("default zone: '%s'" % default_zone)
#fw.setDefaultZone("work")
#print(fw.getDefaultZone())
+#fw.setDefaultZone(default_zone)
+#print(fw.getDefaultZone())
-print(fw.listServices())
print("-------------------------------------------------------------------------------\n")
-settings = fw.getZoneSettings("public")
-print(settings)
-settings.print_str()
+fw.getZoneSettings("public").print_str()
+
+print("\n-------------------------------------------------------------------------------\n")
+
+print(fw.listServices())
+
+print("\n-------------------------------------------------------------------------------\n")
+
+fw.getServiceSettings("mdns").print_str()
+
+fw.getServiceSettings("tftp").print_str()
+
+print("\n-------------------------------------------------------------------------------\n")
print(fw.listIcmpTypes())
-print("-------------------------------------------------------------------------------\n")
+
+print("\n-------------------------------------------------------------------------------\n")
+
+fw.getIcmpTypeSettings("source-quench").print_str()
+
+print("\n-------------------------------------------------------------------------------\n")
print(fw.getZones())
-print("-------------------------------------------------------------------------------\n")
+
+print("\n-------------------------------------------------------------------------------\n")
active_zones = fw.getActiveZones()
for zone in active_zones:
print("%s:" % zone)
print(" 'interfaces': %s" % active_zones[zone].getInterfaces())
print(" 'sources': %s" % active_zones[zone].getSources())
-print("-------------------------------------------------------------------------------\n")
-#print(fw.getZoneOfInterface("em1"))
-#print(fw.getZoneOfSource("192.168.254.253"))
+print("\n-------------------------------------------------------------------------------\n")
-#print("-------------------------------------------------------------------------------\n")
+interface="em1"
+print("Zone Of Interface '%s': '%s'" % (interface,
fw.getZoneOfInterface(interface)))
+source = "192.168.254.253"
+print("Zone Of Source '%s': '%s'" % (source,
fw.getZoneOfSource(source)))
-#zone = ""
-#item = "foobar"
-#print("add interface '%s' to zone '%s': '%s'" % (item,
zone,
-# fw.addInterface(zone, item)))
+print("\n-------------------------------------------------------------------------------\n")
-#zone = "work"
-#print("change zone of interface '%s' to zone '%s':
'%s'" % (item, zone,
-#
fw.changeZoneOfInterface(zone, item)))
+zone = ""
+item = "foobar"
+print("add interface '%s' to zone '%s': '%s'" % (item,
zone,
+ fw.addInterface(zone, item)))
-#print("is interface '%s' bound to zone '%s'? %s" % (item,
zone,
-# "yes" if
fw.queryInterface(zone, item) else "no"))
+zone = "work"
+print("change zone of interface '%s' to zone '%s':
'%s'" % (item, zone,
+
fw.changeZoneOfInterface(zone, item)))
+
+print("is interface '%s' bound to zone '%s'? %s" % (item,
zone,
+ "yes" if
fw.queryInterface(zone, item) else "no"))
-#print("interfaces in zone '%s': %s" % (zone, fw.getInterfaces(zone)))
+print("interfaces in zone '%s': %s" % (zone, fw.getInterfaces(zone)))
-#print("remove interface '%s' from zone '%s': '%s'" %
(item, zone,
-# fw.removeInterface(zone, item)))
+print("remove interface '%s' from zone '%s': '%s'" %
(item, zone,
+ fw.removeInterface(zone, item)))
-#print("interfaces in zone '%s' %s: " % (zone,
fw.getInterfaces(zone)))
+print("interfaces in zone '%s' %s: " % (zone, fw.getInterfaces(zone)))
-#print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
-#zone = ""
-#item = "192.168.254.252"
-#print("add source '%s' to zone '%s': '%s'" % (item,
zone,
-# fw.addSource(zone, item)))
+zone = ""
+item = "192.168.254.252"
+print("add source '%s' to zone '%s': '%s'" % (item,
zone,
+ fw.addSource(zone, item)))
-#zone = "work"
-#print("change zone of source '%s' to zone '%s': '%s'"
% (item, zone,
-# fw.changeZoneOfSource(zone,
item)))
+zone = "work"
+print("change zone of source '%s' to zone '%s': '%s'" %
(item, zone,
+ fw.changeZoneOfSource(zone,
item)))
-#print("is source '%s' bound to zone '%s'? %s" % (item, zone,
-# "yes" if fw.querySource(zone,
item) else "no"))
+print("is source '%s' bound to zone '%s'? %s" % (item, zone,
+ "yes" if fw.querySource(zone,
item) else "no"))
-#print("sources in zone '%s': %s" % (zone, fw.getSources(zone)))
+print("sources in zone '%s': %s" % (zone, fw.getSources(zone)))
-#print("remove source '%s' from zone '%s': '%s'" %
(item, zone,
-# fw.removeSource(zone, item)))
+print("remove source '%s' from zone '%s': '%s'" %
(item, zone,
+ fw.removeSource(zone, item)))
-#print("sources in zone '%s' %s: " % (zone, fw.getSources(zone)))
+print("sources in zone '%s' %s: " % (zone, fw.getSources(zone)))
-#print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
-#zone = "work"
-#item = "rule service name=ftp audit limit value='1/m' accept"
-#print("add rich rule '%s' to zone '%s': '%s'" % (item,
zone,
-# fw.addRichRule(zone, item, 0)))
+zone = "work"
+item = "rule service name=ftp audit limit value='1/m' accept"
+print("add rich rule '%s' to zone '%s': '%s'" % (item,
zone,
+ fw.addRichRule(zone, item, 0)))
-#print("is rich rule '%s' in zone '%s'? %s\n" % (item, zone,
-# "yes" if
fw.queryRichRule(zone, item) else "no"))
+print("is rich rule '%s' in zone '%s'? %s\n" % (item, zone,
+ "yes" if fw.queryRichRule(zone,
item) else "no"))
-#print("rich rules in zone '%s': %s" % (zone, fw.getRichRules(zone)))
+print("rich rules in zone '%s': %s" % (zone, fw.getRichRules(zone)))
-#print("remove rich rule '%s' from zone '%s': '%s'\n" %
(item, zone,
-# fw.removeRichRule(zone, item)))
+print("remove rich rule '%s' from zone '%s': '%s'\n" %
(item, zone,
+ fw.removeRichRule(zone, item)))
-#print("rich rules in zone '%s': %s" % (zone, fw.getRichRules(zone)))
+print("rich rules in zone '%s': %s" % (zone, fw.getRichRules(zone)))
-#print("-------------------------------------------------------------------------------\n")
+print("-------------------------------------------------------------------------------\n")
-#zone = "work"
-#item = "tftp"
-#print("add service '%s' to zone '%s': '%s'\n" % (item,
zone,
-# fw.addService(zone, item, 0)))
+zone = "work"
+item = "tftp"
+print("add service '%s' to zone '%s': '%s'\n" % (item,
zone,
+ fw.addService(zone, item, 0)))
-#print("is service '%s' in zone '%s'? %s\n" % (item, zone,
-# "yes" if fw.queryService(zone,
item) else "no"))
+print("is service '%s' in zone '%s'? %s\n" % (item, zone,
+ "yes" if fw.queryService(zone,
item) else "no"))
-#print("services in zone '%s': %s" % (zone, fw.getServices(zone)))
+print("services in zone '%s': %s" % (zone, fw.getServices(zone)))
-#print("remove service '%s' from zone '%s': '%s'\n" %
(item, zone, fw.removeService(zone, item)))
+print("remove service '%s' from zone '%s': '%s'\n" %
(item, zone, fw.removeService(zone, item)))
-#print("services in zone '%s': %s" % (zone, fw.getServices(zone)))
+print("services in zone '%s': %s" % (zone, fw.getServices(zone)))
-#print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
zone = "work"
item = "70"
@@ -136,9 +168,9 @@ print("ports in zone '%s': [%s]" % (zone, ",
".join(z.getStr() for z in fw.getP
print("remove port '%s' from zone '%s': '%s'" % (item,
zone,
fw.removePort(zone, item, item2)))
-print("ports in zone '%s': [%s]\n" % (zone, ",
".join(z.getStr() for z in fw.getPorts(zone))))
+print("ports in zone '%s': [%s]" % (zone, ",
".join(z.getStr() for z in fw.getPorts(zone))))
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
print("add masquerade zone '%s': '%s'" % (zone,
fw.addMasquerade(zone, 0)))
@@ -148,10 +180,10 @@ print("is masquerade enabled in zone '%s'? %s" %
(zone,
print("remove masquerade from zone '%s': '%s'" % (zone,
fw.removeMasquerade(zone)))
-print("is masquerade enabled in zone '%s'? %s\n" % (zone,
+print("is masquerade enabled in zone '%s'? %s" % (zone,
"yes" if
fw.queryMasquerade(zone) else "no"))
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
zone = "work"
item = "70"
@@ -169,9 +201,9 @@ print("forward ports in zone '%s': [%s]" % (zone,
", ".join(z.getStr() for z in
print("remove forward port '%s' from zone '%s': '%s'" %
(item, zone,
fw.removeForwardPort(zone, item,
item2, item3, item4)))
-print("forward ports in zone '%s': [%s]\n" % (zone, ",
".join(z.getStr() for z in fw.getForwardPorts(zone))))
+print("forward ports in zone '%s': [%s]" % (zone, ",
".join(z.getStr() for z in fw.getForwardPorts(zone))))
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
zone = "work"
item = "time-exceeded"
@@ -203,9 +235,9 @@ print("chains in ipv '%s' and table '%s':
%s" % (ipv, table, fw.getChains(ipv, t
print("remove chain '%s' from ipv '%s' and table '%s'"
% (chain, ipv, table))
fw.removeChain(ipv, table, chain)
-print("chains in ipv '%s' and table '%s': %s\n" % (ipv, table,
fw.getChains(ipv, table)))
+print("chains in ipv '%s' and table '%s': %s" % (ipv, table,
fw.getChains(ipv, table)))
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
ipv = "ipv4"
table = "filter"
@@ -221,9 +253,9 @@ print("chains in ipv '%s' and table '%s':
%s" % (ipv, table, fw.getChains(ipv, t
print("remove chain '%s' from ipv '%s' and table '%s'"
% (chain, ipv, table))
fw.removeChain(ipv, table, chain)
-print("chains in ipv '%s' and table '%s': %s\n" % (ipv, table,
fw.getChains(ipv, table)))
+print("chains in ipv '%s' and table '%s': %s" % (ipv, table,
fw.getChains(ipv, table)))
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
ipv = "ipv4"
table = "filter"
@@ -246,18 +278,18 @@ print("query if rule %s is in ipv '%s', table
'%s', chain '%s' and priority %d:
print("rules in ipv '%s', table '%s', chain '%s': %s" %
(ipv, table, chain, fw.getRules(ipv, table, chain)))
-print("all rules: %s\n" % ([ (rule.getIpv(), rule.getTable(), rule.getChain(),
rule.getPriority(), rule.getArgs()) for rule in fw.getAllRules()] ))
+print("all rules: %s" % ([ (rule.getIpv(), rule.getTable(), rule.getChain(),
rule.getPriority(), rule.getArgs()) for rule in fw.getAllRules()] ))
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
ipv = "ipv4"
args = [ "-A", "INPUT", "-s", "1.2.3.4",
"-j", "DROP" ]
print("passthrough rule %s to ipv '%s': %s" % (args, ipv,
fw.passthrough(ipv, args)))
args = [ "-D", "INPUT", "-s", "1.2.3.4",
"-j", "DROP" ]
-print("passthrough rule %s to ipv '%s': %s\n" % (args, ipv,
fw.passthrough(ipv, args)))
+print("passthrough rule %s to ipv '%s': %s" % (args, ipv,
fw.passthrough(ipv, args)))
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
ipv = "ipv4"
args = [ "-A", "INPUT", "-s", "1.2.3.4",
"-j", "DROP" ]
@@ -295,7 +327,7 @@ fw.removeAllPassthroughs()
print("get all passthrough rules: %s" % ([ [ p.getIpv(), p.getArgs() ] for p in
fw.getAllPassthroughs() ]))
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
print("enable lockdown")
fw.enableLockdown()
@@ -305,9 +337,9 @@ print("query lockdown: %s" % fw.queryLockdown())
print("disable lockdown")
fw.disableLockdown()
-print("query lockdown: %s\n" % fw.queryLockdown())
+print("query lockdown: %s" % fw.queryLockdown())
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
print("get lockdown whitelist commands: %s" %
fw.getLockdownWhitelistCommands())
command = "/usr/bin/foobar"
@@ -323,9 +355,9 @@ fw.removeLockdownWhitelistCommand(command)
print("query lockdown whitelist command '%s': %s" % (command,
fw.queryLockdownWhitelistCommand(command)))
-print("get lockdown whitelist commands: %s\n" %
fw.getLockdownWhitelistCommands())
+print("get lockdown whitelist commands: %s" %
fw.getLockdownWhitelistCommands())
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
print("get lockdown whitelist contexts: %s" %
fw.getLockdownWhitelistContexts())
context = "system_u:system_r:MadDaemon_t:s0"
@@ -341,9 +373,9 @@ fw.removeLockdownWhitelistContext(context)
print("query lockdown whitelist context '%s': %s" % (context,
fw.queryLockdownWhitelistContext(context)))
-print("get lockdown whitelist contexts: %s\n" %
fw.getLockdownWhitelistContexts())
+print("get lockdown whitelist contexts: %s" %
fw.getLockdownWhitelistContexts())
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
print("get lockdown whitelist uids: %s" % fw.getLockdownWhitelistUids())
uid = 6666
@@ -359,9 +391,9 @@ fw.removeLockdownWhitelistUid(uid)
print("query lockdown whitelist uid '%s': %s" % (uid,
fw.queryLockdownWhitelistUid(uid)))
-print("get lockdown whitelist uids: %s\n" % fw.getLockdownWhitelistUids())
+print("get lockdown whitelist uids: %s" % fw.getLockdownWhitelistUids())
-print("-------------------------------------------------------------------------------\n")
+print("\n-------------------------------------------------------------------------------\n")
print("get lockdown whitelist users: %s" % fw.getLockdownWhitelistUsers())
user = "theboss"
@@ -377,4 +409,7 @@ fw.removeLockdownWhitelistUser(user)
print("query lockdown whitelist user '%s': %s" % (user,
fw.queryLockdownWhitelistUser(user)))
-print("get lockdown whitelist users: %s\n" % fw.getLockdownWhitelistUsers())
+print("get lockdown whitelist users: %s" % fw.getLockdownWhitelistUsers())
+
+print("\n-------------------------------------------------------------------------------\n")
+