docs/swagger/wforce_api.7.yml

@@ -189,7 +189,7 @@ definitions:
       pwhash:
         type: string
       success:
-        type: string
+        type: boolean
       policy_reject:
         type: boolean
       attrs:

regression-tests/test_Basics.py

@@ -28,7 +28,7 @@ def test_getBL(self):
 
     def test_getDBStats(self):
         self.writeFileToConsole(configFile)
-        self.reportFunc('dbstats', '1.4.3.2', '1234', 'false'); 
+        self.reportFunc('dbstats', '1.4.3.2', '1234', False); 
         r = self.getDBStatsLogin('dbstats')
         j = r.json();
         self.assertRegexpMatches(json.dumps(j), "countLogins")
@@ -41,7 +41,7 @@ def chunkGen(self):
         payload['login'] = "chunky"
         payload['remote'] = "127.0.0.1"
         payload['pwhash'] = "1234"
-        payload['success'] = true
+        payload['success'] = True
         payload['attrs'] = {}
         yield json.dumps(payload)
 

regression-tests/test_Block.py

@@ -14,7 +14,7 @@ def test_block(self):
         r.close()
 
         for i in range(100):
-            r = self.reportFunc('baddie', '127.0.0.1', "1234'%s" % i, 'false')
+            r = self.reportFunc('baddie', '127.0.0.1', "1234'%s" % i, False)
             r.json()
 
         r = self.allowFunc('baddie', '127.0.0.1', "1234")

regression-tests/test_TimeWindows.py

@@ -16,7 +16,7 @@ def test_invalidPasswords(self):
         r.close()
 
         for i in range(25):
-            r = self.reportFunc('ivbaddie', '127.0.0.1', "1234'%s" % i, 'true')
+            r = self.reportFunc('ivbaddie', '127.0.0.1', "1234'%s" % i, True)
             r.json()
 
         r = self.allowFunc('ivbaddie', '127.0.0.1', "1234")
@@ -37,7 +37,7 @@ def test_FailedLogins(self):
         r.close()
 
         for i in range(31):
-            r = self.reportFunc('flbaddie', '128.0.0.1', "1234", 'false')
+            r = self.reportFunc('flbaddie', '128.0.0.1', "1234", False)
             r.json()
 
         r = self.allowFunc('flbaddie', '128.0.0.1', "1234")
@@ -58,7 +58,7 @@ def test_diffIPs(self):
         r.close()
 
         for i in range(12):
-            r = self.reportFunc('ipbaddie', "127.0.0.%s" % i, "1234", 'true')
+            r = self.reportFunc('ipbaddie', "127.0.0.%s" % i, "1234", True)
             r.json()
 
         r = self.allowFunc('ipbaddie', '127.0.0.1', "1234")
@@ -79,7 +79,7 @@ def test_subTest(self):
         r.close()
 
         for i in range(41):
-            r = self.reportFunc('subbaddie', '128.0.0.1', "1234", 'false')
+            r = self.reportFunc('subbaddie', '128.0.0.1', "1234", False)
             r.json()
 
         r = self.allowFunc('subbaddie', '128.0.0.1', "1234")
@@ -100,7 +100,7 @@ def test_countMinPrefixv4(self):
         r.close()
 
         for i in range(12):
-            r = self.reportFunc('ipv4baddie%s' % i, "114.31.192.%s" % i, "1234", 'true')
+            r = self.reportFunc('ipv4baddie%s' % i, "114.31.192.%s" % i, "1234", True)
             r.json()
 
         r = self.allowFunc('ipv4baddie', '114.31.192.200', "1234")
@@ -121,7 +121,7 @@ def test_countMinPrefixv6(self):
         r.close()
 
         for i in range(12):
-            r = self.reportFunc('ipv6baddie%s' % i, "2001:c78::%s" % i, "1234", 'true')
+            r = self.reportFunc('ipv6baddie%s' % i, "2001:c78::%s" % i, "1234", True)
             r.json()
 
         r = self.allowFunc('ipv6baddie', '2001:c78::1000', "1234")
@@ -142,7 +142,7 @@ def test_expiry(self):
         r.close()
 
         for i in range(40):
-            r = self.reportFunc('expirebaddie%s' % i, "127.0.0.1", "1234", 'true')
+            r = self.reportFunc('expirebaddie%s' % i, "127.0.0.1", "1234", True)
             r.json()
 
         r = self.allowFunc('expirebaddie', '127.0.0.1', "1234")
@@ -163,7 +163,7 @@ def test_Reset(self):
         r.close()
 
         for i in range(31):
-            r = self.reportFunc('resetbaddie', '128.0.0.1', "1234", 'false')
+            r = self.reportFunc('resetbaddie', '128.0.0.1', "1234", False)
             r.json()
 
         r = self.allowFunc('resetbaddie', '128.0.0.1', "1234")

wforce.cc

@@ -679,7 +679,7 @@ try
   };
   int longindex=0;
   for(;;) {
-    int c=getopt_long(argc, argv, "hsdc:e:C:l:m:v", longopts, &longindex);
+    int c=getopt_long(argc, argv, "hsdce:C:l:v", longopts, &longindex);
     if(c==-1)
       break;
     switch(c) {