Changeset 6812

Timestamp:

Sep 30, 2008, 2:08:21 PM (13 years ago)

Author:

livings124

Message:

again verify that ip addresses are valid for the acl (removed in [6803])

File:

• trunk/macosx/PrefsController.m (modified) (2 diffs)

trunk/macosx/PrefsController.m

@@ -956 +956 @@
         
         //create better-formatted ip string
+        BOOL valid = false;
         if ([components count] == 4)
         {
+            valid = true;
             NSEnumerator * enumerator = [components objectEnumerator];
             NSString * component;
@@ -965 +967 @@
                     [newComponents addObject: component];
                 else
-                    [newComponents addObject: [[NSNumber numberWithInt: [component intValue]] stringValue]];
+                {
+                    int num = [component intValue];
+                    if (num >= 0 && num < 256)
+                        [newComponents addObject: [[NSNumber numberWithInt: num] stringValue]];
+                    else
+                    {
+                        valid = false;
+                        break;
+                    }
+                }
             }
         }
         
-        NSString * newIP = [newComponents componentsJoinedByString: @"."];
-        
-        NSDictionary * newDict = [NSDictionary dictionaryWithObjectsAndKeys: newIP, @"IP",
-                                    [oldDict objectForKey: @"Allow"], @"Allow", nil];
-        [fRPCAccessArray replaceObjectAtIndex: row withObject: newDict];
-        
-        NSSortDescriptor * descriptor = [[[NSSortDescriptor alloc] initWithKey: @"IP" ascending: YES
-                                            selector: @selector(compareNumeric:)] autorelease];
-        [fRPCAccessArray sortUsingDescriptors: [NSArray arrayWithObject: descriptor]];
+        if (valid)
+        {
+            NSString * newIP = [newComponents componentsJoinedByString: @"."];
+            
+            NSDictionary * newDict = [NSDictionary dictionaryWithObjectsAndKeys: newIP, @"IP",
+                                        [oldDict objectForKey: @"Allow"], @"Allow", nil];
+            [fRPCAccessArray replaceObjectAtIndex: row withObject: newDict];
+            
+            NSSortDescriptor * descriptor = [[[NSSortDescriptor alloc] initWithKey: @"IP" ascending: YES
+                                                selector: @selector(compareNumeric:)] autorelease];
+            [fRPCAccessArray sortUsingDescriptors: [NSArray arrayWithObject: descriptor]];
+        }
+        else
+        {
+            NSBeep();
+            if ([[oldDict objectForKey: @"IP"] isEqualToString: @""])
+                [fRPCAccessArray removeObjectAtIndex: row];
+        }
         
         [fRPCAccessTable deselectAll: self];