ip or password (see issue 107)

[jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 4d698c2b7126e3dd6e3a91ca04d87530b52a7118..99c11ec166e2165a926ad144957555df23ca7026 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1079,6 +1079,45 @@ function jirafeau_challenge_upload_ip($cfg, $ip)
     return false;
 }
 
     return false;
 }
 

+/**
+ * Test if visitor's IP is authorized or password is supplied and authorized
+ * @param $ip IP to be challenged
+ * @param $password password to be challenged
+ * @return true if access is valid, false otherwise.
+ */
+function jirafeau_challenge_upload ($cfg, $ip, $password)
+{
+    // Allow if no ip restrictaion and no password restriction
+    if ((count ($cfg['upload_ip']) == 0) and (count ($cfg['upload_password']) == 0)) {
+        return true;
+    }
+
+    // Allow if ip is in array
+    foreach ($cfg['upload_ip'] as $i) {
+        if ($i == $ip) {
+            return true;
+        }
+        // CIDR test for IPv4 only.
+        if (strpos ($i, '/') !== false)
+        {
+            list ($subnet, $mask) = explode('/', $i);
+            if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet)) {
+                return true;
+            }
+        }
+    }
+    if (!jirafeau_has_upload_password($cfg)) {
+        return false;
+    }
+    
+    foreach ($cfg['upload_password'] as $p) {
+        if ($password == $p) {
+            return true;
+        }
+    }
+    return false;
+}
+

 /** Tell if we have some HTTP headers generated by a proxy */
 function has_http_forwarded()
 {
 /** Tell if we have some HTTP headers generated by a proxy */
 function has_http_forwarded()
 {