[yast-commit] r39644 - in /trunk/squid: src/Squid.ycp src/complex.ycp src/dialogs.ycp testsuite/tests/SquidRead.err testsuite/tests/SquidRead.out testsuite/tests/SquidRead.ycp

24 Jul 2007

Author: dfiser
Date: Tue Jul 24 18:17:17 2007
New Revision: 39644

URL: http://svn.opensuse.org/viewcvs/yast?rev=39644&view=rev
Log:
Squid::Read function + testsuite.
Basic handling of http ports dialog.

Added:
    trunk/squid/testsuite/tests/SquidRead.err
    trunk/squid/testsuite/tests/SquidRead.out
    trunk/squid/testsuite/tests/SquidRead.ycp
Modified:
    trunk/squid/src/Squid.ycp
    trunk/squid/src/complex.ycp
    trunk/squid/src/dialogs.ycp

Modified: trunk/squid/src/Squid.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=39644&r1=39643&r2=39644&view=diff
==============================================================================

--- trunk/squid/src/Squid.ycp (original)
+++ trunk/squid/src/Squid.ycp Tue Jul 24 18:17:17 2007
@@ -40,6 +40,9 @@
 import "Summary";
 import "Message";
 
+/**
+ * Defines path used in SCR::Read/Write functions
+ */
 path squid_path = .squid;
 
 
@@ -49,9 +52,12 @@
 boolean modified = false;
 
 /**
- * Map of all configuration settings except consequential
+ * Map of all configuration settings except consequential. Format:
+ * $[ "parameter name" : [ list of options (rest of line) ]
+ *    ...
+ * ]
  */
-map settings = $[];
+map  settings = $[];
 
 /**
  * List of http_ports. Format:
@@ -63,9 +69,13 @@
  */
 list  > http_ports = [];
 
-/** TODO
+/**
  * List of acls. Format:
- * [ $[ ???
+ * [ $[ "name" : "localhost",
+ *      "type" : "src",
+ *      "options" : [ non-empty list of options ]]
+ *      ...
+ * ]
  */
 list  > acls = [];
 
@@ -81,6 +91,7 @@
 /**
  * List of refresh patterns. Format:
  * [ $["regexp" : "^ftp:",
+ *     "case_sensitive" : true,
  *     "min" : 12,
  *     "max" : 12,
  *     "percent" : 12],
@@ -90,6 +101,36 @@
 list  > refresh_patterns = [];
 
 
+/**
+ * Map of all available parameters with defalut values.
+ * $[ "parameter_name" : [ list of default options ],
+ *    ...
+ *  ]
+ */
+map  parameters = $[
+    "cache_dir" : ["ufs", "/var/cache/squid", "100", "16", "256"],
+    "cache_mem" : ["8", "MB"],
+    "cache_swap_low" : ["90"],
+    "cache_swap_high" : ["95"],
+    "maximum_object_size" : ["4096", "KB"],
+    "minimum_object_size" : ["0", "KB"],
+    "cache_replacement_policy" : ["lru"],
+    "memory_replacement_policy" : ["lru"],
+
+    "access_log" : ["/var/log/squid/access.log"],
+    "cache_log" : ["/var/log/squid/cache.log"],
+    "cache_store_log" : ["/var/log/squid/store.log"],
+    "cache_swap_log" : ["none"],
+    "emulate_httpd_log" : ["off"],
+
+    "connect_timeout" : ["2", "minutes"],
+    "client_lifetime" : ["1", "day"],
+
+    "error_directory" : ["/usr/share/squid/errors/English"],
+    "cache_mgr" : ["webmaster"],
+    "ftp_passive" : ["on"]
+];
+
 
 
 global boolean Modified(){
@@ -126,14 +167,55 @@
 }
 
 
+
+global list<string> GetSetting(string name)
+{
+    return settings[name]:[];
+}
+
+global list  > GetHttpPorts()
+{
+    return http_ports;
+}
+global map GetHttpPort(integer id_item)
+{
+    return http_ports[id_item]:$[];
+}
+global void AddHttpPort(map data)
+{
+    http_ports = add(http_ports, data);
+    y2debug("====== %1",http_ports);
+}
+global void ModifyHttpPort(integer id_item, map data)
+{
+    http_ports[id_item] = data;
+}
+global void DelHttpPort(integer id_item)
+{
+    http_ports = remove(http_ports, id_item);
+}
+
+/**
+ * Same as splitstring(), but returns only non-empty strings.
+ */
+list<string> split(string str, string delim)
+{
+    return filter(string value, splitstring(str, delim),
+                {
+                    //y2debug("Squid::split value: %1, size(value): %2",value, size(value));
+                    return (size(value)>0);
+                });
+}
+
 /**
- * Read setting of parameter http_port. It can be in form:
- * http_port [hostname:]port [transparent]
+ * Read setting of parameter http_port.
+ *      http_port [hostname:]port [transparent]
  *
  * return true on success
  */
 boolean readHttpPorts()
 {
+    boolean ok = true;
     list tmp = [];
     list tmp2 = [];
     map  tmp_http_port = $[];
@@ -145,20 +227,23 @@
             tmp = [];
             tmp2 = [];
 
-            tmp = splitstring(value," \t");
+            tmp = split(value," \t");
 
             //can parse only 'http_port hostname:port [transparent]'
-            if (size(tmp) < 1 || size(tmp) > 2) return false;
+            if (size(tmp) < 1 || size(tmp) > 2){
+                ok = false;
+                return false;
+            }
 
             // hostname and port
-            tmp2 = splitstring(tmp[0]:"",":");
+            tmp2 = split(tmp[0]:"",":");
             y2debug("readHttpPorts - tmp2: %1",tmp2);
             if (size(tmp2) == 1){
                 tmp_http_port["host"] = "";
-                tmp_http_port["port"] = tointeger(tmp2[0]:"");
+                tmp_http_port["port"] = tmp2[0]:"";
             }else{
                 tmp_http_port["host"] = (string)tmp2[0]:"";
-                tmp_http_port["port"] = tointeger(tmp2[1]:"");
+                tmp_http_port["port"] = tmp2[1]:"";
             }
 
             //transparent option
@@ -168,7 +253,143 @@
             http_ports = add(http_ports, tmp_http_port);
         });
 
-    return true;
+    return ok;
+}
+
+/**
+ * Read setting of parameter http_access.
+ *      http_access allow acl1 !acl2 ...
+ *
+ * return true on success
+ */
+boolean readHttpAccesses()
+{
+    boolean ok = true;
+    list tmp = [];
+    map  tmp_http_access = $[];
+
+    http_accesses = [];
+    foreach (string value, (list<string>)SCR::Read( add(squid_path,"http_access")),
+        {
+            tmp_http_access = $[];
+
+            tmp = split(value, " \t");
+
+            if (tmp[0]:"" != "allow" && tmp[0]:"" != "deny"){
+                ok = false;
+                return false;
+            }
+
+            tmp_http_access["allow"] = (tmp[0]:"" == "allow" ? true : false);
+            tmp_http_access["acl"] = remove(tmp, 0);
+
+            http_accesses = add(http_accesses, tmp_http_access);
+        });
+
+    return ok;
+}
+
+/**
+ * Read setting of parameter refresh_pattern.
+ *      refresh_pattern [-i] regexp min percent max [options (ignored)]
+ *
+ * return true on success
+ */
+boolean readRefreshPatterns()
+{
+    boolean ok = true;
+    list tmp = [];
+    map  tmp_refresh_pattern = $[];
+
+    refresh_patterns = [];
+    foreach (string value, (list<string>)SCR::Read( add(squid_path, "refresh_pattern")),
+        {
+            tmp_refresh_pattern = $[];
+
+            tmp = split(value, " \t");
+
+            //case-insesitive
+            if (tmp[0]:"" == "-i"){
+                tmp_refresh_pattern["case_sensitive"] = false;
+                tmp = remove(tmp, 0);
+            }else{
+                tmp_refresh_pattern["case_sensitive"] = true;
+            }
+
+            if (size(tmp) < 4){
+                ok = false;
+                return false;
+            }
+
+            tmp_refresh_pattern["regexp"] = tmp[0]:"";
+            tmp_refresh_pattern["min"] = tmp[1]:"";
+            tmp_refresh_pattern["percent"] = tmp[2]:"";
+            tmp_refresh_pattern["max"] = tmp[3]:"";
+
+            refresh_patterns = add(refresh_patterns, tmp_refresh_pattern);
+        });
+
+    return ok;
+}
+
+/**
+ * Read setting of parameter acl.
+ *      acl aclname acltype string1 string2 ...
+ *
+ * return true on success
+ */
+boolean readACLs()
+{
+    boolean ok = true;
+    list tmp = [];
+    map  tmp_acl = $[];
+
+
+    acls = [];
+    foreach (string value, (list<string>)SCR::Read( add(squid_path, "acl")),
+        {
+            tmp_acl = $[];
+
+            tmp = split(value, " \t");
+
+            if (size(tmp) < 3){
+                ok = false;
+                return false;
+            }
+
+            tmp_acl["name"] = tmp[0]:"";
+            tmp_acl["type"] = tmp[1]:"";
+            tmp_acl["options"] = remove(remove(tmp,0),0);
+
+            acls = add(acls, tmp_acl);
+        });
+    return ok;
+}
+
+/**
+ * Read rest of setting.
+ * return true on success
+ */
+boolean readRestSetting()
+{
+    boolean ok = true;
+    list tmp = [];
+
+    settings = $[];
+    foreach (string key, list value, parameters,
+        {
+            tmp = (list <string>)SCR::Read( add(squid_path, key));
+            tmp = split(tmp[0]:"", " \t");
+
+            if (size(tmp) > 0){
+                settings[key] = tmp;
+            }else{
+                settings[key] = value;
+            }
+
+        });
+
+    return ok;
 }
 
 /**
@@ -178,30 +399,42 @@
 global boolean Read() {
     boolean ok = true;
 
-    /* Squid read dialog caption */
-    string caption = _("Initializing squid Configuration");
-
-    integer steps = 2;
-
-    Progress::New(caption, " ", steps, [_("Read the settings")], [_("Reading the settings..."), _("Finished")], "");
+    Progress::New(_("Initializing squid Configuration"),
+                  " ",
+                  5,
+                  [_("Read the settings")],
+                  [_("Reading the setting ...")],
+                  "");
 
     if(Abort()) return false;
     Progress::NextStage();
 
     if (!readHttpPorts()) ok = false;
-    // TODO:
-    //if (!readRefreshPatterns()) ok = false;
-    //if (!readACLs()) ok = false;
-    //if (!readHttpAccesses()) ok = false;
-    //if (!readRestSetting()) ok = false;
+    Progress::NextStep();
+
+    if (!readRefreshPatterns()) ok = false;
+    Progress::NextStep();
+
+    if (!readACLs()) ok = false;
+    Progress::NextStep();
+
+    if (!readHttpAccesses()) ok = false;
+    Progress::NextStep();
 
+    if (!readRestSetting()) ok = false;
+    Progress::NextStep();
+
+    y2debug("================ Setting ======================");
     y2debug("Squid::Read - http_ports: %1",http_ports);
+    y2debug("Squid::Read - http_accesses: %1", http_accesses);
+    y2debug("Squid::Read - acls: %1", acls);
+    y2debug("Squid::Read - refresh_patterns: %1", refresh_patterns);
+    y2debug("Squid::Read - settings: %1", settings);
+    y2debug("================ Setting END ==================");
 
     /* Error message */
     if(!ok) Report::Error(_("Cannot read configuration file."));
 
-    Progress::NextStep();
-
     return true;
 }
 

Modified: trunk/squid/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=39644&r1=39643&r2=39644&view=diff
==============================================================================
--- trunk/squid/src/complex.ycp (original)
+++ trunk/squid/src/complex.ycp Tue Jul 24 18:17:17 2007
@@ -84,5 +84,64 @@
 }
 
 
+
+/* Inits */
+void InitHttpPortsTable()
+{
+    list items = [];
+    integer i = 0;
+
+    foreach(map value, Squid::GetHttpPorts(),
+        {
+            items = add(items, `item(`id(i), value["host"]:"", value["port"]:"",
+                                      (value["transparent"]:false ? "transparent" : "")));
+            i = i+1;
+        });
+
+    y2debug("complex::InitPortsTable() - items: %1, http_ports: %2", items, Squid::GetHttpPorts());
+    UI::ChangeWidget(`id("http_port"), `Items, items);
+    if (size(items) > 0){
+        UI::ChangeWidget(`id(`edit), `Enabled, true);
+        UI::ChangeWidget(`id(`del), `Enabled, true);
+    }else{
+        UI::ChangeWidget(`id(`edit), `Enabled, false);
+        UI::ChangeWidget(`id(`del), `Enabled, false);
+    }
+}
+void InitAddEditHttpPortDialog(integer id_item)
+{
+    if (id_item != nil){
+        map values = Squid::GetHttpPort(id_item);
+
+        UI::ChangeWidget(`id("host"), `Value, values["host"]:"");
+        UI::ChangeWidget(`id("port"), `Value, values["port"]:"");
+        UI::ChangeWidget(`id("transparent"), `Value, values["transparent"]:false);
+    }
+}
+
+
+
+/* Storing */
+void StoreDataFromAddEditHttpPortDialog(integer id_item)
+{
+    map  data = $[
+        "host" : UI::QueryWidget(`id("host"), `Value),
+        "port" : UI::QueryWidget(`id("port"), `Value),
+        "transparent" : UI::QueryWidget(`id("transparent"), `Value)
+    ];
+    y2debug("complex::StoreDataFromAddEditHttpPortDialog() - data: %1",data);
+
+    //Add
+    if (id_item == nil){
+        Squid::AddHttpPort(data);
+    }else{
+        Squid::ModifyHttpPort(id_item, data);
+    }
+}
+
+void DelFromHttpPortsDialog(integer id_item)
+{
+    Squid::DelHttpPort(id_item);
+}
 }
 /* vim: set sw=4 ts=4 et ft=ycp : */

Modified: trunk/squid/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=39644&r1=39643&r2=39644&view=diff
==============================================================================
--- trunk/squid/src/dialogs.ycp (original)
+++ trunk/squid/src/dialogs.ycp Tue Jul 24 18:17:17 2007
@@ -59,13 +59,12 @@
 /**
  * returns true if something added/edited otherwise false
  */
-boolean AddEditHttpPortDialog(any id_item)
+boolean AddEditHttpPortDialog(integer id_item)
 {
     any ui = nil;
     boolean ret = false;
     string label = (id_item == nil ? _("Add New HTTP Port")
-                                   : _("Edit Current HTTP Port"));
-
+                                      : _("Edit Current HTTP Port"));
     term contents =
         `VBox(
             `Left(`Label(label)),
@@ -86,6 +85,8 @@
     UI::OpenDialog(`opt(`decorated), contents);
     UI::ChangeWidget(`id("port"), `ValidChars, "1234567890");
 
+    InitAddEditHttpPortDialog(id_item);
+
     while (true){
         ui = UI::UserInput();
 
@@ -93,6 +94,7 @@
             ret = false;
             break;
         }else if (ui == `ok){
+            StoreDataFromAddEditHttpPortDialog(id_item);
             ret = true;
             break;
         }
@@ -107,6 +109,7 @@
 any HttpPortsDialog(){
     any ret = nil;
     any http_port = nil;
+    any tmp = nil;
 
     term dialog_contents =
         `VBox(
@@ -124,8 +127,7 @@
         Label::BackButton(), Label::NextButton());
     Wizard::DisableBackButton();
 
-    UI::ChangeWidget(`id("http_port"), `Items, [`item(`id(1), "localhost","3128",""), `item(`id(2), "","80","tranparent")]);
-
+    InitHttpPortsTable();
 
     while (true){
         ret = UI::UserInput();
@@ -138,12 +140,14 @@
             break;
             continue;
         }else if (ret == `add){
-            AddEditHttpPortDialog(nil);
+            if (AddEditHttpPortDialog(nil))
+                InitHttpPortsTable();
         }else if (ret == `edit){
-            AddEditHttpPortDialog(UI::QueryWidget(`id("http_port"), `CurrentItem));
-
-            http_port = UI::QueryWidget(`id("http_port"), `CurrentItem);
-            y2debug("id: %1, currentPort: %2, currentPortValue: %3", ret, http_port,UI::QueryWidget(`id("http_port"), `Item(http_port)));
+            if (AddEditHttpPortDialog((integer)UI::QueryWidget(`id("http_port"), `CurrentItem)))
+                InitHttpPortsTable();
+        }else if (ret == `del){
+            DelFromHttpPortsDialog((integer)UI::QueryWidget(`id("http_port"), `CurrentItem));
+            InitHttpPortsTable();
         }
     }
 
@@ -209,7 +213,13 @@
     term dialog_contents =
         `VBox(
             `Left(`Label( _("Refresh Patterns"))),
-            `Table(`id("refresh_patterns"), `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)),
+            `HBox(
+                `Table(`id("refresh_patterns"), `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)),
+                `VBox(
+                    `PushButton(`id(`up), Label::UpButton()),
+                    `PushButton(`id(`down), Label::DownButton())
+                )
+            ),
             `HBox(
                 `PushButton(`id(`add), Label::AddButton()),
                 `PushButton(`id(`del), Label::DeleteButton()),

Added: trunk/squid/testsuite/tests/SquidRead.err
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/SquidRead.err?rev=39644&view=auto
==============================================================================
    (empty)

Added: trunk/squid/testsuite/tests/SquidRead.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/SquidRead.out?rev=39644&view=auto
==============================================================================
--- trunk/squid/testsuite/tests/SquidRead.out (added)
+++ trunk/squid/testsuite/tests/SquidRead.out Tue Jul 24 18:17:17 2007
@@ -0,0 +1,111 @@
+Dump	Squid::readHttpPorts()
+Read	.squid."http_port" ["localhost:3128", "80 transparent"]
+Return	true
+Dump	Squid::http_ports
+Return	[$["host":"localhost", "port":3128], $["host":"", "port":80, "transparent":true]]
+Dump	------------------------------
+Dump	Squid::readHttpAccesses()
+Read	.squid."http_access" ["allow manager localhost", "deny manager", "deny !Safe_ports", "deny CONNECT  !SSL_ports", "allow localhost", "allow  localhost_public", "deny all"]
+Return	true
+Dump	Squid::http_accesses
+Return	[$["acl":["manager", "localhost"], "allow":true], $["acl":["manager"], "allow":false], $["acl":["!Safe_ports"], "allow":false], $["acl":["CONNECT", "!SSL_ports"], "allow":false], $["acl":["localhost"], "allow":true], $["acl":["localhost_public"], "allow":true], $["acl":["all"], "allow":false]]
+Dump	------------------------------
+Dump	Squid::readRefreshPatterns()
+Read	.squid."refresh_pattern" ["^ftp:\t\t1440\t20%\t10080", "-i ^gopher:\t1440\t0%\t1440", ".\t\t0\t20%\t4320"]
+Return	true
+Dump	Squid::refresh_patterns
+Return	[$["case_sensitive":true, "max":"10080", "min":"1440", "percent":"20%", "regexp":"^ftp:"], $["case_sensitive":false, "max":"1440", "min":"1440", "percent":"0%", "regexp":"^gopher:"], $["case_sensitive":true, "max":"4320", "min":"0", "percent":"20%", "regexp":"."]]
+Dump	------------------------------
+Dump	Squid::readACLs()
+Read	.squid."acl" ["QUERY urlpath_regex cgi-bin \\?", "apache rep_header Server ^Apache", "all src 0.0.0.0/0.0.0.0", "manager proto cache_object", "localhost src  \t  \t 127.0.0.1/255.255.255.255", "localhost_public src 10.20.1.241/255.255.255.255", "to_localhost dst 127.0.0.0/8", "SSL_ports port  443", "Safe_ports port 80", "Safe_ports port 21", "Safe_ports port    443", "Safe_ports port 70", "Safe_ports port 210", "Safe_ports port 1025-65535", "Safe_ports port 280", "Safe_ports port 488", "Safe_ports port 591", "Safe_ports port 777", "CONNECT method CONNECT"]
+Return	true
+Dump	Squid::acls
+Return	[$["name":"QUERY", "options":["cgi-bin", "\\?"], "type":"urlpath_regex"], $["name":"apache", "options":["Server", "^Apache"], "type":"rep_header"], $["name":"all", "options":["0.0.0.0/0.0.0.0"], "type":"src"], $["name":"manager", "options":["cache_object"], "type":"proto"], $["name":"localhost", "options":["127.0.0.1/255.255.255.255"], "type":"src"], $["name":"localhost_public", "options":["10.20.1.241/255.255.255.255"], "type":"src"], $["name":"to_localhost", "options":["127.0.0.0/8"], "type":"dst"], $["name":"SSL_ports", "options":["443"], "type":"port"], $["name":"Safe_ports", "options":["80"], "type":"port"], $["name":"Safe_ports", "options":["21"], "type":"port"], $["name":"Safe_ports", "options":["443"], "type":"port"], $["name":"Safe_ports", "options":["70"], "type":"port"], $["name":"Safe_ports", "options":["210"], "type":"port"], $["name":"Safe_ports", "options":["1025-65535"], "type":"port"], $["name":"Safe_ports", "options":["280"], "type":"port"], $["name":"Safe_ports", "options":["488"], "type":"port"], $["name":"Safe_ports", "options":["591"], "type":"port"], $["name":"Safe_ports", "options":["777"], "type":"port"], $["name":"CONNECT", "options":["CONNECT"], "type":"method"]]
+Dump	------------------------------
+Dump	Squid::readRestSetting()
+Read	.squid."access_log" ["/var/log/squid/access.log"]
+Read	.squid."cache_dir" ["ufs", "/var/cache/squid", "100", "16", "256"]
+Read	.squid."cache_log" ["/var/log/squid/cache.log"]
+Read	.squid."cache_mem" ["80", "MB"]
+Read	.squid."cache_mgr" ["webmaster"]
+Read	.squid."cache_replacement_policy" ["lru"]
+Read	.squid."cache_store_log" ["/var/log/squid/store.log"]
+Read	.squid."cache_swap_high" ["95"]
+Read	.squid."cache_swap_log" ["none"]
+Read	.squid."cache_swap_low" ["90"]
+Read	.squid."client_lifetime" ["1", "day"]
+Read	.squid."connect_timeout" ["2", "minutes"]
+Read	.squid."emulate_httpd_log" ["off"]
+Read	.squid."error_directory" ["/usr/share/squid/errors/English"]
+Read	.squid."ftp_passive" ["on"]
+Read	.squid."maximum_object_size" ["4096", "KB"]
+Read	.squid."memory_replacement_policy" ["heap GDSF"]
+Read	.squid."minimum_object_size" ["0", "KB"]
+Return	true
+Dump	Squid::settings
+Return	$["access_log":["/var/log/squid/access.log"], "cache_dir":["ufs"], "cache_log":["/var/log/squid/cache.log"], "cache_mem":["80"], "cache_mgr":["webmaster"], "cache_replacement_policy":["lru"], "cache_store_log":["/var/log/squid/store.log"], "cache_swap_high":["95"], "cache_swap_log":["none"], "cache_swap_low":["90"], "client_lifetime":["1"], "connect_timeout":["2"], "emulate_httpd_log":["off"], "error_directory":["/usr/share/squid/errors/English"], "ftp_passive":["on"], "maximum_object_size":["4096"], "memory_replacement_policy":["heap", "GDSF"], "minimum_object_size":["0"]]
+Dump	------------------------------
+Dump	Squid::Read()
+Read	.squid."http_port" ["localhost:3128", "80 transparent"]
+Read	.squid."refresh_pattern" ["^ftp:\t\t1440\t20%\t10080", "-i ^gopher:\t1440\t0%\t1440", ".\t\t0\t20%\t4320"]
+Read	.squid."acl" ["QUERY urlpath_regex cgi-bin \\?", "apache rep_header Server ^Apache", "all src 0.0.0.0/0.0.0.0", "manager proto cache_object", "localhost src  \t  \t 127.0.0.1/255.255.255.255", "localhost_public src 10.20.1.241/255.255.255.255", "to_localhost dst 127.0.0.0/8", "SSL_ports port  443", "Safe_ports port 80", "Safe_ports port 21", "Safe_ports port    443", "Safe_ports port 70", "Safe_ports port 210", "Safe_ports port 1025-65535", "Safe_ports port 280", "Safe_ports port 488", "Safe_ports port 591", "Safe_ports port 777", "CONNECT method CONNECT"]
+Read	.squid."http_access" ["allow manager localhost", "deny manager", "deny !Safe_ports", "deny CONNECT  !SSL_ports", "allow localhost", "allow  localhost_public", "deny all"]
+Read	.squid."access_log" ["/var/log/squid/access.log"]
+Read	.squid."cache_dir" ["ufs", "/var/cache/squid", "100", "16", "256"]
+Read	.squid."cache_log" ["/var/log/squid/cache.log"]
+Read	.squid."cache_mem" ["80", "MB"]
+Read	.squid."cache_mgr" ["webmaster"]
+Read	.squid."cache_replacement_policy" ["lru"]
+Read	.squid."cache_store_log" ["/var/log/squid/store.log"]
+Read	.squid."cache_swap_high" ["95"]
+Read	.squid."cache_swap_log" ["none"]
+Read	.squid."cache_swap_low" ["90"]
+Read	.squid."client_lifetime" ["1", "day"]
+Read	.squid."connect_timeout" ["2", "minutes"]
+Read	.squid."emulate_httpd_log" ["off"]
+Read	.squid."error_directory" ["/usr/share/squid/errors/English"]
+Read	.squid."ftp_passive" ["on"]
+Read	.squid."maximum_object_size" ["4096", "KB"]
+Read	.squid."memory_replacement_policy" ["heap GDSF"]
+Read	.squid."minimum_object_size" ["0", "KB"]
+Return	true
+Dump	Squid::settings
+Return	$["access_log":["/var/log/squid/access.log"], "cache_dir":["ufs"], "cache_log":["/var/log/squid/cache.log"], "cache_mem":["80"], "cache_mgr":["webmaster"], "cache_replacement_policy":["lru"], "cache_store_log":["/var/log/squid/store.log"], "cache_swap_high":["95"], "cache_swap_log":["none"], "cache_swap_low":["90"], "client_lifetime":["1"], "connect_timeout":["2"], "emulate_httpd_log":["off"], "error_directory":["/usr/share/squid/errors/English"], "ftp_passive":["on"], "maximum_object_size":["4096"], "memory_replacement_policy":["heap", "GDSF"], "minimum_object_size":["0"]]
+Dump	Squid::acls
+Return	[$["name":"QUERY", "options":["cgi-bin", "\\?"], "type":"urlpath_regex"], $["name":"apache", "options":["Server", "^Apache"], "type":"rep_header"], $["name":"all", "options":["0.0.0.0/0.0.0.0"], "type":"src"], $["name":"manager", "options":["cache_object"], "type":"proto"], $["name":"localhost", "options":["127.0.0.1/255.255.255.255"], "type":"src"], $["name":"localhost_public", "options":["10.20.1.241/255.255.255.255"], "type":"src"], $["name":"to_localhost", "options":["127.0.0.0/8"], "type":"dst"], $["name":"SSL_ports", "options":["443"], "type":"port"], $["name":"Safe_ports", "options":["80"], "type":"port"], $["name":"Safe_ports", "options":["21"], "type":"port"], $["name":"Safe_ports", "options":["443"], "type":"port"], $["name":"Safe_ports", "options":["70"], "type":"port"], $["name":"Safe_ports", "options":["210"], "type":"port"], $["name":"Safe_ports", "options":["1025-65535"], "type":"port"], $["name":"Safe_ports", "options":["280"], "type":"port"], $["name":"Safe_ports", "options":["488"], "type":"port"], $["name":"Safe_ports", "options":["591"], "type":"port"], $["name":"Safe_ports", "options":["777"], "type":"port"], $["name":"CONNECT", "options":["CONNECT"], "type":"method"]]
+Dump	Squid::refresh_patterns
+Return	[$["case_sensitive":true, "max":"10080", "min":"1440", "percent":"20%", "regexp":"^ftp:"], $["case_sensitive":false, "max":"1440", "min":"1440", "percent":"0%", "regexp":"^gopher:"], $["case_sensitive":true, "max":"4320", "min":"0", "percent":"20%", "regexp":"."]]
+Dump	Squid::http_accesses
+Return	[$["acl":["manager", "localhost"], "allow":true], $["acl":["manager"], "allow":false], $["acl":["!Safe_ports"], "allow":false], $["acl":["CONNECT", "!SSL_ports"], "allow":false], $["acl":["localhost"], "allow":true], $["acl":["localhost_public"], "allow":true], $["acl":["all"], "allow":false]]
+Dump	Squid::http_ports
+Return	[$["host":"localhost", "port":3128], $["host":"", "port":80, "transparent":true]]
+Dump	------------------------------
+Dump	----testing defualt values----
+Dump	Squid:Read()
+Read	.squid."http_port" ["localhost:3128", "80 transparent"]
+Read	.squid."refresh_pattern" ["^ftp:\t\t1440\t20%\t10080", "-i ^gopher:\t1440\t0%\t1440", ".\t\t0\t20%\t4320"]
+Read	.squid."acl" ["QUERY urlpath_regex cgi-bin \\?", "apache rep_header Server ^Apache", "all src 0.0.0.0/0.0.0.0", "manager proto cache_object", "localhost src  \t  \t 127.0.0.1/255.255.255.255", "localhost_public src 10.20.1.241/255.255.255.255", "to_localhost dst 127.0.0.0/8", "SSL_ports port  443", "Safe_ports port 80", "Safe_ports port 21", "Safe_ports port    443", "Safe_ports port 70", "Safe_ports port 210", "Safe_ports port 1025-65535", "Safe_ports port 280", "Safe_ports port 488", "Safe_ports port 591", "Safe_ports port 777", "CONNECT method CONNECT"]
+Read	.squid."http_access" ["allow manager localhost", "deny manager", "deny !Safe_ports", "deny CONNECT  !SSL_ports", "allow localhost", "allow  localhost_public", "deny all"]
+Read	.squid."access_log" ["/var/log/squid/access.log"]
+Read	.squid."cache_dir" ["ufs", "/var/cache/squid", "100", "16", "256"]
+Read	.squid."cache_log" ["/var/log/squid/cache.log"]
+Read	.squid."cache_mem" nil
+Read	.squid."cache_mgr" ["webmaster"]
+Read	.squid."cache_replacement_policy" ["lru"]
+Read	.squid."cache_store_log" ["/var/log/squid/store.log"]
+Read	.squid."cache_swap_high" ["95"]
+Read	.squid."cache_swap_log" ["none"]
+Read	.squid."cache_swap_low" ["90"]
+Read	.squid."client_lifetime" ["1", "day"]
+Read	.squid."connect_timeout" ["2", "minutes"]
+Read	.squid."emulate_httpd_log" ["off"]
+Read	.squid."error_directory" ["/usr/share/squid/errors/English"]
+Read	.squid."ftp_passive" ["on"]
+Read	.squid."maximum_object_size" ["4096", "KB"]
+Read	.squid."memory_replacement_policy" nil
+Read	.squid."minimum_object_size" ["0", "KB"]
+Return	true
+Dump	Squid::settings["cache_mem"]:["1"] == Squid::parameters["cache_mem"]:["2"]
+Return	true
+Dump	Squid::settings["memory_replacement_policy"]:["1"] == Squid::parameters["memory_replacement_memory"]:["2"]
+Return	true

Added: trunk/squid/testsuite/tests/SquidRead.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/SquidRead.ycp?rev=39644&view=auto
==============================================================================
--- trunk/squid/testsuite/tests/SquidRead.ycp (added)
+++ trunk/squid/testsuite/tests/SquidRead.ycp Tue Jul 24 18:17:17 2007
@@ -0,0 +1,134 @@
+{
+
+// testedfiles: Squid.ycp
+
+map READ = $[
+    "squid" : $[
+        "http_port" : ["localhost:3128", "80 transparent"],
+        "acl" : ["QUERY urlpath_regex cgi-bin \\?",
+                 "apache rep_header Server ^Apache",
+                 "all src 0.0.0.0/0.0.0.0",
+                 "manager proto cache_object",
+                 "localhost src  \t  \t 127.0.0.1/255.255.255.255",
+                 "localhost_public src 10.20.1.241/255.255.255.255",
+                 "to_localhost dst 127.0.0.0/8",
+                 "SSL_ports port  443",
+                 "Safe_ports port 80",
+                 "Safe_ports port 21",
+                 "Safe_ports port    443",
+                 "Safe_ports port 70",
+                 "Safe_ports port 210",
+                 "Safe_ports port 1025-65535",
+                 "Safe_ports port 280",
+                 "Safe_ports port 488",
+                 "Safe_ports port 591",
+                 "Safe_ports port 777",
+                 "CONNECT method CONNECT"],
+        "http_access" : ["allow manager localhost",
+                         "deny manager",
+                         "deny !Safe_ports",
+                         "deny CONNECT  !SSL_ports",
+                         "allow localhost",
+                         "allow  localhost_public",
+                         "deny all"],
+       "refresh_pattern" : ["^ftp:\t\t1440\t20%\t10080",
+                            "-i ^gopher:\t1440\t0%\t1440",
+                            ".\t\t0\t20%\t4320"],
+
+       "cache_dir" : ["ufs", "/var/cache/squid", "100", "16", "256"],
+       "cache_mem" : ["80", "MB"],
+       "cache_swap_low" : ["90"],
+       "cache_swap_high" : ["95"],
+       "maximum_object_size" : ["4096", "KB"],
+       "minimum_object_size" : ["0", "KB"],
+       "cache_replacement_policy" : ["lru"],
+       "memory_replacement_policy" : ["heap GDSF"],
+
+       "access_log" : ["/var/log/squid/access.log"],
+       "cache_log" : ["/var/log/squid/cache.log"],
+       "cache_store_log" : ["/var/log/squid/store.log"],
+       "cache_swap_log" : ["none"],
+       "emulate_httpd_log" : ["off"],
+
+       "connect_timeout" : ["2", "minutes"],
+       "client_lifetime" : ["1", "day"],
+
+       "error_directory" : ["/usr/share/squid/errors/English"],
+       "cache_mgr" : ["webmaster"],
+       "ftp_passive" : ["on"]
+    ]
+];
+
+map WRITE = $[];
+map EXECUTE = $[];
+
+include "testsuite.ycp";
+//TESTSUITE_INIT([READ,WRITE,EXECUTE], nil);
+
+import "Squid";
+
+DUMP("Squid::readHttpPorts()");
+TEST(``(Squid::readHttpPorts()), [READ], nil);
+DUMP("Squid::http_ports");
+TEST(``(Squid::http_ports), [], nil);
+
+DUMP("------------------------------");
+
+DUMP("Squid::readHttpAccesses()");
+TEST(``(Squid::readHttpAccesses()), [READ], nil);
+DUMP("Squid::http_accesses");
+TEST(``(Squid::http_accesses), [], nil);
+
+DUMP("------------------------------");
+
+DUMP("Squid::readRefreshPatterns()");
+TEST(``(Squid::readRefreshPatterns()), [READ], nil);
+DUMP("Squid::refresh_patterns");
+TEST(``(Squid::refresh_patterns), [], nil);
+
+DUMP("------------------------------");
+
+DUMP("Squid::readACLs()");
+TEST(``(Squid::readACLs()), [READ], nil);
+DUMP("Squid::acls");
+TEST(``(Squid::acls), [], nil);
+
+DUMP("------------------------------");
+
+DUMP("Squid::readRestSetting()");
+TEST(``(Squid::readRestSetting()), [READ], nil);
+DUMP("Squid::settings");
+TEST(``(Squid::settings), [], nil);
+
+DUMP("------------------------------");
+
+DUMP("Squid::Read()");
+TEST(``(Squid::Read()), [READ], nil);
+DUMP("Squid::settings");
+TEST(``(Squid::settings), [], nil);
+DUMP("Squid::acls");
+TEST(``(Squid::acls), [], nil);
+DUMP("Squid::refresh_patterns");
+TEST(``(Squid::refresh_patterns), [], nil);
+DUMP("Squid::http_accesses");
+TEST(``(Squid::http_accesses), [], nil);
+DUMP("Squid::http_ports");
+TEST(``(Squid::http_ports), [], nil);
+
+
+/* Testing of using default values: */
+DUMP("------------------------------");
+DUMP("----testing defualt values----");
+READ["squid"] = remove(READ["squid"]:$[], "cache_mem");
+READ["squid"] = remove(READ["squid"]:$[], "memory_replacement_policy");
+
+DUMP("Squid:Read()");
+TEST(``(Squid::Read()), [READ], nil);
+
+DUMP("Squid::settings[\"cache_mem\"]:[\"1\"] == Squid::parameters[\"cache_mem\"]:[\"2\"]");
+TEST(``(Squid::settings["cache_mem"]:["1"] == Squid::parameters["cache_mem"]:["2"]), [], nil);
+
+DUMP("Squid::settings[\"memory_replacement_policy\"]:[\"1\"] == Squid::parameters[\"memory_replacement_memory\"]:[\"2\"]");
+TEST(``(Squid::settings["memory_replacement_policy"]:["1"] == Squid::parameters["memory_replacement_policy"]:["2"]), [], nil);
+}
+/* vim: set sw=4 ts=4 et ft=ycp : */

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r39644 - in /trunk/squid: src/Squid.ycp src/complex.ycp src/dialogs.ycp testsuite/tests/SquidRead.err testsuite/tests/SquidRead.out testsuite/tests/SquidRead.ycp

dfiser＠svn.opensuse.org