August 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r65409 - /tags/branch-Code-11-SP2-2_17_108/yast2/
by locilka＠svn2.opensuse.org 29 Aug '11

29 Aug '11

Author: locilka Date: Mon Aug 29 11:24:16 2011 New Revision: 65409 URL: http://svn.opensuse.org/viewcvs/yast?rev=65409&view=rev Log: Created tag branch-Code-11-SP2-2_17_108 for yast2 Added: tags/branch-Code-11-SP2-2_17_108/yast2/ (props changed) - copied from r65408, branches/SuSE-Code-11-SP2-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65408 - /tags/branch-Code-11-SP2-2_17_108/
by locilka＠svn2.opensuse.org 29 Aug '11

29 Aug '11

Author: locilka Date: Mon Aug 29 11:24:13 2011 New Revision: 65408 URL: http://svn.opensuse.org/viewcvs/yast?rev=65408&view=rev Log: Created tag branch-Code-11-SP2-2_17_108 Added: tags/branch-Code-11-SP2-2_17_108/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65407 - in /branches/SuSE-Code-11-SP2-Branch/yast2: VERSION package/yast2.changes
by locilka＠svn2.opensuse.org 29 Aug '11

29 Aug '11

Author: locilka Date: Mon Aug 29 11:23:45 2011 New Revision: 65407 URL: http://svn.opensuse.org/viewcvs/yast?rev=65407&view=rev Log: 2.17.108 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Mon Aug 29 11:23:45 2011 @@ -1 +1 @@ -2.17.107 +2.17.108 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Mon Aug 29 11:23:45 2011 @@ -5,6 +5,7 @@ understand flags as the fifth parameter (bnc#712670) - Fixed SuSEfirewall2 SCR agent to parse the sysconfig file properly (bnc#712670) +- 2.17.108 ------------------------------------------------------------------- Thu Aug 3 13:42:53 MDT 2011 - carnold(a)novell.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65406 - /tags/branch-Code-11-SP1-2_17_10/firewall/
by locilka＠svn2.opensuse.org 29 Aug '11

29 Aug '11

Author: locilka Date: Mon Aug 29 11:20:25 2011 New Revision: 65406 URL: http://svn.opensuse.org/viewcvs/yast?rev=65406&view=rev Log: Created tag branch-Code-11-SP1-2_17_10 for firewall Added: tags/branch-Code-11-SP1-2_17_10/firewall/ (props changed) - copied from r65405, branches/SuSE-Code-11-SP1-Branch/firewall/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65405 - in /branches/SuSE-Code-11-SP1-Branch/firewall: VERSION package/yast2-firewall.changes
by locilka＠svn2.opensuse.org 29 Aug '11

29 Aug '11

Author: locilka Date: Mon Aug 29 11:17:09 2011 New Revision: 65405 URL: http://svn.opensuse.org/viewcvs/yast?rev=65405&view=rev Log: 2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/firewall/VERSION branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes Modified: branches/SuSE-Code-11-SP1-Branch/firewall/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firew… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/VERSION Mon Aug 29 11:17:09 2011 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firew… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes Mon Aug 29 11:17:09 2011 @@ -2,6 +2,7 @@ Fri Aug 26 13:33:57 CEST 2011 - locilka(a)suse.cz - Fixed Custom Rules dialog to handle additional flags (bnc#712670) +- 2.17.10 ------------------------------------------------------------------- Fri Apr 2 15:24:40 CEST 2010 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65404 - in /branches/SuSE-Code-11-SP1-Branch/firewall: package/yast2-firewall.changes src/subdialogs.ycp src/summary.ycp src/uifunctions.ycp
by locilka＠svn2.opensuse.org 26 Aug '11

26 Aug '11

Author: locilka Date: Fri Aug 26 13:43:21 2011 New Revision: 65404 URL: http://svn.opensuse.org/viewcvs/yast?rev=65404&view=rev Log: - Fixed Custom Rules dialog to handle additional flags (bnc#712670) Modified: branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp branches/SuSE-Code-11-SP1-Branch/firewall/src/summary.ycp branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp Modified: branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firew… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes Fri Aug 26 13:43:21 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 26 13:33:57 CEST 2011 - locilka(a)suse.cz + +- Fixed Custom Rules dialog to handle additional flags (bnc#712670) + +------------------------------------------------------------------- Fri Apr 2 15:24:40 CEST 2010 - locilka(a)suse.cz - Added missing help for accepting-broadcast-reply (BNC #583046). Modified: branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firew… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp Fri Aug 26 13:43:21 2011 @@ -903,7 +903,8 @@ _("Source Network"), _("Protocol"), _("Destination Port"), - _("Source Port") + _("Source Port"), + _("Options") ), [] ), @@ -930,7 +931,8 @@ `item( `id("_rpc_"), SuSEFirewall::GetProtocolTranslatedName("_rpc_")), ])), `InputField (`id("add_destination_port"), `opt (`hstretch), _("&Destination Port (Optional)")), - `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)")) + `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)")), + `InputField (`id("add_options"), `opt (`hstretch), _("Additiona &Options (Optional)")) ) ), Modified: branches/SuSE-Code-11-SP1-Branch/firewall/src/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firew… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/src/summary.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/src/summary.ycp Fri Aug 26 13:43:21 2011 @@ -280,11 +280,12 @@ foreach (map <string, string> one_rule, custom_rules, { string proto = one_rule["protocol"]:"tcp"; string one_rule_s = li_start + sformat ( - _("Network: %1, Protocol: %2, Destination port: %3, Source port: %4"), + _("Network: %1, Protocol: %2, Destination port: %3, Source port: %4, Options: %5"), String::EscapeTags (one_rule["network"]:_("All")), String::EscapeTags (SuSEFirewall::GetProtocolTranslatedName (one_rule["protocol"]:_("All"))), (one_rule["dport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["dport"]:"", proto)) : _("All")), - (one_rule["sport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["sport"]:"", proto)) : _("All")) + (one_rule["sport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["sport"]:"", proto)) : _("All")), + (one_rule["options"]:"" != "" ? String::EscapeTags (one_rule["options"]:"") : _("None")) ) + li_end; rules = rules + one_rule_s; }); Modified: branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firew… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp Fri Aug 26 13:43:21 2011 @@ -1244,7 +1244,8 @@ one_rule["network"]:"", SuSEFirewall::GetProtocolTranslatedName (one_rule["protocol"]:""), UserReadablePortName (one_rule["dport"]:"", one_rule["protocol"]:""), - UserReadablePortName (one_rule["sport"]:"", "") + UserReadablePortName (one_rule["sport"]:"", ""), + one_rule["options"]:"" ); }); @@ -1324,6 +1325,7 @@ string add_protocol = (string) UI::QueryWidget(`id("add_protocol"), `Value); string add_destination_port = (string) UI::QueryWidget(`id("add_destination_port"), `Value); string add_source_port = (string) UI::QueryWidget(`id("add_source_port"), `Value); + string add_options = (string) UI::QueryWidget(`id("add_options"), `Value); // network is mandatory if (add_source_network == "" || ! CheckNetwork (add_source_network)) { @@ -1367,8 +1369,9 @@ $[ "network" : add_source_network, "protocol" : add_protocol, - "dport" : add_destination_port, - "sport" : add_source_port + "dport" : add_destination_port, + "sport" : add_source_port, + "options" : add_options, ] ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65403 - /branches/SuSE-Code-11-SP2-Branch/firewall/
by locilka＠svn2.opensuse.org 26 Aug '11

26 Aug '11

Author: locilka Date: Fri Aug 26 13:42:56 2011 New Revision: 65403 URL: http://svn.opensuse.org/viewcvs/yast?rev=65403&view=rev Log: Actually not needed, SP1 version will be enough Removed: branches/SuSE-Code-11-SP2-Branch/firewall/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65402 - in /trunk/firewall: package/yast2-firewall.changes src/subdialogs.ycp src/summary.ycp src/uifunctions.ycp
by locilka＠svn2.opensuse.org 26 Aug '11

26 Aug '11

Author: locilka Date: Fri Aug 26 13:41:52 2011 New Revision: 65402 URL: http://svn.opensuse.org/viewcvs/yast?rev=65402&view=rev Log: - Fixed Custom Rules dialog to handle additional flags (bnc#712670) Modified: trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/subdialogs.ycp trunk/firewall/src/summary.ycp trunk/firewall/src/uifunctions.ycp Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.… ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Fri Aug 26 13:41:52 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 26 13:33:57 CEST 2011 - locilka(a)suse.cz + +- Fixed Custom Rules dialog to handle additional flags (bnc#712670) + +------------------------------------------------------------------- Fri Aug 5 12:32:00 CEST 2011 - tgoettlicher(a)suse.de - fixed .desktop file (bnc #681249) Modified: trunk/firewall/src/subdialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/subdialogs.ycp?rev=… ============================================================================== --- trunk/firewall/src/subdialogs.ycp (original) +++ trunk/firewall/src/subdialogs.ycp Fri Aug 26 13:41:52 2011 @@ -903,7 +903,8 @@ _("Source Network"), _("Protocol"), _("Destination Port"), - _("Source Port") + _("Source Port"), + _("Options") ), [] ), @@ -930,7 +931,8 @@ `item( `id("_rpc_"), SuSEFirewall::GetProtocolTranslatedName("_rpc_")), ])), `InputField (`id("add_destination_port"), `opt (`hstretch), _("&Destination Port (Optional)")), - `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)")) + `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)")), + `InputField (`id("add_options"), `opt (`hstretch), _("Additiona &Options (Optional)")) ) ), Modified: trunk/firewall/src/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/summary.ycp?rev=654… ============================================================================== --- trunk/firewall/src/summary.ycp (original) +++ trunk/firewall/src/summary.ycp Fri Aug 26 13:41:52 2011 @@ -280,11 +280,12 @@ foreach (map <string, string> one_rule, custom_rules, { string proto = one_rule["protocol"]:"tcp"; string one_rule_s = li_start + sformat ( - _("Network: %1, Protocol: %2, Destination port: %3, Source port: %4"), + _("Network: %1, Protocol: %2, Destination port: %3, Source port: %4, Options: %5"), String::EscapeTags (one_rule["network"]:_("All")), String::EscapeTags (SuSEFirewall::GetProtocolTranslatedName (one_rule["protocol"]:_("All"))), (one_rule["dport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["dport"]:"", proto)) : _("All")), - (one_rule["sport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["sport"]:"", proto)) : _("All")) + (one_rule["sport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["sport"]:"", proto)) : _("All")), + (one_rule["options"]:"" != "" ? String::EscapeTags (one_rule["options"]:"") : _("None")) ) + li_end; rules = rules + one_rule_s; }); Modified: trunk/firewall/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/uifunctions.ycp?rev… ============================================================================== --- trunk/firewall/src/uifunctions.ycp (original) +++ trunk/firewall/src/uifunctions.ycp Fri Aug 26 13:41:52 2011 @@ -1244,7 +1244,8 @@ one_rule["network"]:"", SuSEFirewall::GetProtocolTranslatedName (one_rule["protocol"]:""), UserReadablePortName (one_rule["dport"]:"", one_rule["protocol"]:""), - UserReadablePortName (one_rule["sport"]:"", "") + UserReadablePortName (one_rule["sport"]:"", ""), + one_rule["options"]:"" ); }); @@ -1324,6 +1325,7 @@ string add_protocol = (string) UI::QueryWidget(`id("add_protocol"), `Value); string add_destination_port = (string) UI::QueryWidget(`id("add_destination_port"), `Value); string add_source_port = (string) UI::QueryWidget(`id("add_source_port"), `Value); + string add_options = (string) UI::QueryWidget(`id("add_options"), `Value); // network is mandatory if (add_source_network == "" || ! CheckNetwork (add_source_network)) { @@ -1367,8 +1369,9 @@ $[ "network" : add_source_network, "protocol" : add_protocol, - "dport" : add_destination_port, - "sport" : add_source_port + "dport" : add_destination_port, + "sport" : add_source_port, + "options" : add_options, ] ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65401 - /branches/SuSE-Code-11-SP2-Branch/firewall/
by locilka＠svn2.opensuse.org 26 Aug '11

26 Aug '11

Author: locilka Date: Fri Aug 26 13:36:48 2011 New Revision: 65401 URL: http://svn.opensuse.org/viewcvs/yast?rev=65401&view=rev Log: Branching firewall (different dependencies SP1 vs SP2) Added: branches/SuSE-Code-11-SP2-Branch/firewall/ (props changed) - copied from r65400, branches/SuSE-Code-11-SP1-Branch/firewall/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65400 - in /trunk/yast2: library/network/agents/ library/network/src/ library/network/testsuite/tests/ package/
by locilka＠svn2.opensuse.org 26 Aug '11

26 Aug '11

Author: locilka Date: Fri Aug 26 13:31:11 2011 New Revision: 65400 URL: http://svn.opensuse.org/viewcvs/yast?rev=65400&view=rev Log: - Fixed handling of FW_SERVICES_ACCEPT_* in SuSEFirewall modules to understand flags as the fifth parameter (bnc#712670) - Fixed SuSEfirewall2 SCR agent to parse the sysconfig file properly (bnc#712670) Modified: trunk/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr trunk/yast2/library/network/src/SuSEFirewall.ycp trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/agents/sys… ============================================================================== --- trunk/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr (original) +++ trunk/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr Fri Aug 26 13:31:11 2011 @@ -33,6 +33,12 @@ "comments": [ "^[ \t]*#.*$", "#.*", "^[ \t]*$", ], "params" : [ $[ + // with quotes + "match" : [ "^[ \t]*([_a-zA-Z0-9]+)[ \t]*=[ \t]*\"(.*)\"[ \t]*$", "%s=\"%s\"" ], + // without quotes + "match" : [ "^[ \t]*([_a-zA-Z0-9]+)[ \t]*=[ \t]*([^\"]*)[ \t]*$", "%s=\"%s\"" ], + ], + $[ "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\"" ], "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"", ], ], @@ -41,9 +47,6 @@ "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)'", "%s=\"%s\"" ], "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)", "([^\']*)'", ], ], - $[ - "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*([^\"]*[^ \t\"]|)[ \t]*$", "%s=\"%s\"",], - ], ], ] ) Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewall.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewall.ycp Fri Aug 26 13:31:11 2011 @@ -302,7 +302,8 @@ void ReadSysconfigSuSEFirewall (list<string> variables) { foreach (string variable, variables, { string value = (string) SCR::Read(add(.sysconfig.SuSEfirewall2,variable)); - // if variable is undefined, get default value + + // if value is undefined, get default value if (value == nil || value == "") value = GetDefaultValue(variable); @@ -367,14 +368,14 @@ ); if (! write_status) { - Report::Error(Message::CannotWriteSettingsTo("/etc/sysconfig/SuSEFirewall")); + Report::Error(Message::CannotWriteSettingsTo("/etc/sysconfig/SuSEFirewall2")); break; } }); write_status = SCR::Write(.sysconfig.SuSEfirewall2, nil); if (! write_status) { - Report::Error(Message::CannotWriteSettingsTo("/etc/sysconfig/SuSEFirewall")); + Report::Error(Message::CannotWriteSettingsTo("/etc/sysconfig/SuSEFirewall2")); } return write_status; Modified: trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp Fri Aug 26 13:31:11 2011 @@ -187,7 +187,7 @@ // // FW_SERVICES_ACCEPT_EXT, FW_SERVICES_ACCEPT_INT, FW_SERVICES_ACCEPT_DMZ - // Format: space separated list of net,protocol[,dport][,sport] + // Format: space separated list of net,protocol[,dport][,sport][,other-comma-separated-options] // list <map <string, string> > rules = maplist ( string one_rule, @@ -195,11 +195,17 @@ { // comma separated list <string> rule_splitted = splitstring(one_rule, ","); + + // additional options after sport (4th entry) + integer options_entries_count = size(rule_splitted) - 4; + return $[ "network" : rule_splitted[0]:"", "protocol" : rule_splitted[1]:"", "dport" : rule_splitted[2]:"", "sport" : rule_splitted[3]:"", + // additional options if defined (offset 4 and more) + "options" : (options_entries_count > 0 ? mergestring(sublist(rule_splitted, 4, options_entries_count), ",") : ""), ]; }); @@ -209,7 +215,8 @@ one_rule["network"]:"" == "" && one_rule["protocol"]:"" == "" && one_rule["dport"]:"" == "" && - one_rule["sport"]:"" == "" + one_rule["sport"]:"" == "" && + one_rule["options"]:"" == "" ); }); @@ -217,6 +224,36 @@ } /** + * Creates a string with one rule definition as described by the given params. + * All the trailing commas are removed + * + * @param map <string, string> params + * @return string rule definition + */ + string CreateRuleFromParams (map <string, string> params) { + // Adjusting params (some empty entries are replaced with $everything value) + params = AdjustParameters (params); + + // Creating new record + string new_rule = params["network"]:"" + + "," + params["protocol"]:"" + + "," + params["dport"]:"" + + "," + params["sport"]:"" + + "," + params["options"]:""; + + // Cut out all the trailing commas + while (regexpmatch (new_rule, ",\+$")) { + new_rule = regexpsub (new_rule, "(.*),\+$", "\\1"); + } + + if (new_rule == "0/0,all") { + y2warning("Created rule '%1' that allows everything from all networks!", new_rule); + } + + return new_rule; + } + + /** * Adds a new accept-rule. Possible keys for parameters are "network", * "protocol", "dport" and "sport". Needed are "network" and "protocol". * @@ -230,7 +267,8 @@ * @example * AddNewAcceptRule ( * "EXT", - * $["network":"192.168.0.1/255.255.240.0", "protocol":"tcp", "sport":"22"] + * $["network":"192.168.0.1/255.255.240.0", "protocol":"tcp", "sport":"22", + * "options":"hitcount=3,blockseconds=60,recentname=ssh"] * ) -> true */ global boolean AddNewAcceptRule (string zone, map <string, string> params) { @@ -241,7 +279,7 @@ y2error("Unknown firewall zone: %1", zone); return nil; } - + // Get all current rules string current_rules = SuSEFirewall::GetAcceptExpertRules(zone); if (current_rules == nil) { @@ -249,28 +287,10 @@ return false; } - // Adjusting params - params = AdjustParameters(params); - - // Creating new record - string new_rule = params["network"]:"" + "," + params["protocol"]:""; - - // either 'dport' or 'sport' - if (params["dport"]:"" != "" || params["sport"]:"" != "") { - // 'dport' can be empty even if 'sport' is set - new_rule = new_rule + "," + params["dport"]:""; - - if (params["sport"]:"" != "") { - new_rule = new_rule + "," + params["sport"]:""; - } - } + string new_rule = CreateRuleFromParams (params); - if (new_rule == "0/0,all") { - y2warning("Adding rule '%1' that allows everything from all networks!", new_rule); - } - current_rules = current_rules + (size(current_rules) > 0 ? " ":"") + new_rule; - + return SuSEFirewall::SetAcceptExpertRules(zone, current_rules); } @@ -305,10 +325,10 @@ return false; } + integer current_rules_number = size (current_rules); + // Creating record to be removed - string remove_rule = params["network"]:"" + "," + params["protocol"]:""; - if (params["dport"]:"" != "") remove_rule = remove_rule + "," + params["dport"]:""; - if (params["sport"]:"" != "") remove_rule = remove_rule + "," + params["sport"]:""; + string remove_rule = CreateRuleFromParams (params); // Filtering out the record list <string> current_rules_list = splitstring (current_rules, " \n"); @@ -316,8 +336,10 @@ return (one_rule != remove_rule && one_rule != "" && one_rule != ","); }); current_rules = mergestring (current_rules_list, " "); - - return SuSEFirewall::SetAcceptExpertRules(zone, current_rules); + + SuSEFirewall::SetAcceptExpertRules (zone, current_rules); + + return (size(SuSEFirewall::GetAcceptExpertRules(zone)) < current_rules_number); } /** Modified: trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out (original) +++ trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out Fri Aug 26 13:31:11 2011 @@ -13,4 +13,22 @@ Return false Return false Return false +Dump Testing adding/reading expert rules +Return [] +Return true +Return [$["dport":"", "network":"192.168.0.1/255.255.240.0", "options":"hitcount=3,blockseconds=60,recentname=ssh", "protocol":"tcp", "sport":"22"]] +Return true +Return [$["dport":"", "network":"192.168.0.1/255.255.240.0", "options":"hitcount=3,blockseconds=60,recentname=ssh", "protocol":"tcp", "sport":"22"], $["dport":"", "network":"192.168.0.1/255.255.240.0", "options":"whatever=1", "protocol":"tcp", "sport":""]] +Return true +Return [$["dport":"", "network":"192.168.0.1/255.255.240.0", "options":"whatever=1", "protocol":"tcp", "sport":""]] +Dump Cannot remove rule that doesn't exist +Return false +Return [$["dport":"", "network":"192.168.0.1/255.255.240.0", "options":"whatever=1", "protocol":"tcp", "sport":""]] +Return true +Return [] +Dump Adding special rule allowed 'from all networks' +Return true +Return [$["dport":"", "network":"0/0", "options":"", "protocol":"udp", "sport":"888"]] +Return true +Return [$["dport":"", "network":"0/0", "options":"", "protocol":"udp", "sport":"888"], $["dport":"", "network":"0.0.0.0/0", "options":"", "protocol":"tcp", "sport":"999"]] Dump == Done == Modified: trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp Fri Aug 26 13:31:11 2011 @@ -27,5 +27,46 @@ TEST(``(SuSEFirewallExpertRules::IsValidNetwork (check_this)), [], nil); }); + DUMP("Testing adding/reading expert rules"); + // Rules are empty at the beginning + TEST(``(SuSEFirewallExpertRules::GetListOfAcceptRules("EXT")), [], nil); + + TEST(``(SuSEFirewallExpertRules::AddNewAcceptRule("EXT", + $["network":"192.168.0.1/255.255.240.0", "protocol":"tcp", "sport":"22", + "options":"hitcount=3,blockseconds=60,recentname=ssh"]) + ), [], nil); + TEST(``(SuSEFirewallExpertRules::GetListOfAcceptRules("EXT")), [], nil); + + TEST(``(SuSEFirewallExpertRules::AddNewAcceptRule("EXT", + $["network":"192.168.0.1/255.255.240.0", "protocol":"tcp", "options":"whatever=1"]) + ), [], nil); + TEST(``(SuSEFirewallExpertRules::GetListOfAcceptRules("EXT")), [], nil); + + // Deleting by rule ID (offset in list) + TEST(``(SuSEFirewallExpertRules::DeleteRuleID("EXT", 0)), [], nil); + TEST(``(SuSEFirewallExpertRules::GetListOfAcceptRules("EXT")), [], nil); + + DUMP("Cannot remove rule that doesn't exist"); + TEST(``(SuSEFirewallExpertRules::RemoveAcceptRule("EXT", + $["network":"192.168.0.1/255.255.240.0", "protocol":"tcp"]) + ), [], nil); + TEST(``(SuSEFirewallExpertRules::GetListOfAcceptRules("EXT")), [], nil); + + // Now "options" match too + TEST(``(SuSEFirewallExpertRules::RemoveAcceptRule("EXT", + $["network":"192.168.0.1/255.255.240.0", "protocol":"tcp", "options":"whatever=1"]) + ), [], nil); + TEST(``(SuSEFirewallExpertRules::GetListOfAcceptRules("EXT")), [], nil); + + DUMP("Adding special rule allowed 'from all networks'"); + TEST(``(SuSEFirewallExpertRules::AddNewAcceptRule("EXT", + $["protocol":"UDP", "sport":"888"])), [], nil); + TEST(``(SuSEFirewallExpertRules::GetListOfAcceptRules("EXT")), [], nil); + + // Special all-IPv4-networks-(only) rule + TEST(``(SuSEFirewallExpertRules::AddNewAcceptRule("EXT", + $["protocol":"TCP", "sport":"999", "network":"0.0.0.0/0"])), [], nil); + TEST(``(SuSEFirewallExpertRules::GetListOfAcceptRules("EXT")), [], nil); + DUMP("== Done =="); } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Aug 26 13:31:11 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Aug 26 13:26:32 CEST 2011 - locilka(a)suse.cz + +- Fixed handling of FW_SERVICES_ACCEPT_* in SuSEFirewall modules to + understand flags as the fifth parameter (bnc#712670) +- Fixed SuSEfirewall2 SCR agent to parse the sysconfig file + properly (bnc#712670) + +------------------------------------------------------------------- Mon Aug 8 11:07:38 UTC 2011 - lslezak(a)suse.cz - improved GPG key import dialog: changed "Import" button to -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0