Author: dfiser
Date: Mon Sep 10 16:14:41 2007
New Revision: 40836
URL: http://svn.opensuse.org/viewcvs/yast?rev=40836&view=rev
Log:
Now it's possible to open configured ports in firewall. It requires to add new sysconfig file /etc/sysconfig/SuSEfirewall2/services/squid to system.
squid.desktop and squid.rnc files moved into config directory.
Added:
trunk/squid/config/
trunk/squid/config/Makefile.am
trunk/squid/config/SuSEfirewall2/
trunk/squid/config/SuSEfirewall2/squid
trunk/squid/config/squid.desktop
- copied unchanged from r40822, trunk/squid/src/squid.desktop
trunk/squid/config/squid.rnc
- copied unchanged from r40822, trunk/squid/src/squid.rnc
Removed:
trunk/squid/src/squid.desktop
trunk/squid/src/squid.rnc
Modified:
trunk/squid/src/Makefile.am
trunk/squid/src/Squid.ycp
trunk/squid/src/complex.ycp
trunk/squid/yast2-squid.spec.in
Added: trunk/squid/config/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/config/Makefile.am?rev=40836&view=auto
==============================================================================
--- trunk/squid/config/Makefile.am (added)
+++ trunk/squid/config/Makefile.am Mon Sep 10 16:14:41 2007
@@ -0,0 +1,14 @@
+# Makefile.am for squid/src
+
+rncdir = $(schemadir)/autoyast/rnc
+pkgdatadir = /etc/sysconfig/SuSEfirewall2.d/services
+
+desktop_DATA = \
+ squid.desktop
+
+rnc_DATA = squid.rnc
+
+pkgdata_DATA = SuSEfirewall2/squid
+
+EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) $(pkgdata_DATA)
+
Added: trunk/squid/config/SuSEfirewall2/squid
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/config/SuSEfirewall2/squid?rev=40836&view=auto
==============================================================================
--- trunk/squid/config/SuSEfirewall2/squid (added)
+++ trunk/squid/config/SuSEfirewall2/squid Mon Sep 10 16:14:41 2007
@@ -0,0 +1,7 @@
+## Name: Squid Service
+## Description: Opens ports for Squid
+TCP=""
+UDP=""
+RPC=""
+IP=""
+BROADCAST=""
Modified: trunk/squid/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Makefile.am?rev=40836&r1=40835&r2=40836&view=diff
==============================================================================
--- trunk/squid/src/Makefile.am (original)
+++ trunk/squid/src/Makefile.am Mon Sep 10 16:14:41 2007
@@ -1,7 +1,6 @@
# Makefile.am for squid/src
yncludedir = @yncludedir@/squid
-rncdir = $(schemadir)/autoyast/rnc
client_DATA = \
squid.ycp \
@@ -19,21 +18,16 @@
helper_functions.ycp \
handlers.ycp
-desktop_DATA = \
- squid.desktop
-
module_DATA = \
Squid.ycp \
SquidACL.ycp \
SquidErrorMessages.ycp
-rnc_DATA = squid.rnc
-
# create a symlink for local build, #145327
squid:
ln -sf . $@
ycpchook = squid
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA)
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA)
include $(top_srcdir)/Makefile.am.common
Modified: trunk/squid/src/Squid.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40836&r1=40835&r2=40836&view=diff
==============================================================================
--- trunk/squid/src/Squid.ycp (original)
+++ trunk/squid/src/Squid.ycp Mon Sep 10 16:14:41 2007
@@ -42,12 +42,27 @@
import "Service";
import "Summary";
import "FileUtils";
+import "SuSEFirewall";
/**
* Defines path used in SCR::Read/Write functions
*/
path squid_path = .etc.squid;
+/**
+ * Defines location of sysconfig file
+ */
+string sysconfig_file = "/etc/sysconfig/SuSEfirewall2.d/services/squid";
+
+/**
+ * Defines name of service which is used by firewall when it's openning ports.
+ */
+string firewall_service_name = "service:squid";
+global string GetFirewallServiceName()
+{
+ return firewall_service_name;
+}
+
/**
* Data was modified?
@@ -703,6 +718,20 @@
/**** REFRESH PATTERN END ****/
/**** HTTP PORT *****/
+/**
+ * Returns only list of configured ports (no hosts and so on)
+ */
+global list<string> GetHttpPortsOnly()
+{
+ list<string> ret = [];
+ foreach (map value, http_ports,
+ {
+ if (size(value["port"]:"") > 0)
+ ret = add(ret, value["port"]:"");
+ });
+ return ret;
+}
+
global list > GetHttpPorts()
{
return http_ports;
@@ -998,9 +1027,6 @@
if (!readRestSetting()) ok = false;
Progress::NextStage();
- if (!readServiceStatus()) ok = false;
- Progress::NextStage();
-
return ok;
}
@@ -1013,25 +1039,44 @@
Progress::New(_("Initializing squid Configuration"),
" ",
- 6,
+ 7,
[_("Read HTTP Ports from config file."),
_("Read Refresh Patterns from config file."),
_("Read ACL Groups from config file."),
_("Read Access Control table from config file."),
_("Read the rest settings."),
- _("Read service status.")],
+ _("Read service status."),
+ _("Read firewall settings.")],
[_("Reading HTTP Ports ..."),
_("Reading Refresh Patterns ..."),
_("Reading ACL Groups ..."),
_("Reading Access Control table ..."),
_("Reading the rest settings ..."),
- _("Reading service status ...")],
+ _("Reading service status ..."),
+ _("Reading firewall settings ...")],
"");
if(Abort()) return false;
Progress::NextStage();
- ok = readAllSettings();
+ if (!readAllSettings()){
+ ok = false;
+ Report::Error(_("Cannot read configuration file."));
+ }
+
+ if (!readServiceStatus()){
+ ok = false;
+ Report::Error(_("Cannot read service status."));
+ }
+ Progress::NextStage();
+
+ Progress::set(false);
+ if (!SuSEFirewall::Read()){
+ ok = false;
+ Report::Error(_("Cannot read firewall settings."));
+ }
+ Progress::set(true);
+ Progress::NextStage();
y2milestone("================ Setting ======================");
y2debug("Squid::Read - http_ports: %1",http_ports);
@@ -1042,9 +1087,6 @@
y2debug("Squid::Read - enabled: %1", service_enabled_on_startup);
y2milestone("================ Setting END ==================");
- /* Error message */
- if(!ok) Report::Error(_("Cannot read configuration file."));
-
return ok;
}
/******************** READ END ******************/
@@ -1199,11 +1241,26 @@
y2milestone("Squid::writeAllSettings started");
- if (!writeHttpPorts()) ok = false;
- if (!writeACLs()) ok = false;
- if (!writeHttpAccesses()) ok = false;
- if (!writeRefreshPatterns()) ok = false;
- if (!writeRestSetting()) ok = false;
+ if (!writeHttpPorts()){
+ y2error("Squid::writeAllSettings - writeHttpPorts failed");
+ ok = false;
+ }
+ if (!writeACLs()){
+ y2error("Squid::writeAllSettings - writeACLs failed");
+ ok = false;
+ }
+ if (!writeHttpAccesses()){
+ y2error("Squid::writeAllSettings - writeHttpAccesses failed");
+ ok = false;
+ }
+ if (!writeRefreshPatterns()){
+ y2error("Squid::writeAllSettings - writeRefreshPatterns failed");
+ ok = false;
+ }
+ if (!writeRestSetting()){
+ y2error("Squid::writeAllSettings - writeRestSetting failed");
+ ok = false;
+ }
if (ok){
if (!SCR::Write(squid_path, nil)){
@@ -1217,6 +1274,51 @@
return ok;
}
+boolean writeFirewallSettings()
+{
+ boolean ok = true;
+
+ if (!GetModified()){
+ y2debug("Squid::writeFirewallSettings - no setting to write, because nothing's changed");
+ return ok;
+ }
+
+ if (!SCR::RegisterAgent (.firewall_service_definition, `ag_ini(`SysConfigFile(sysconfig_file)))){
+ ok = false;
+ y2error("Unable to register sysconfig agent for %1", sysconfig_file);
+ }
+ if (!SCR::Write(.firewall_service_definition.TCP, mergestring(GetHttpPortsOnly(), " ")) ||
+ !SCR::Write(.firewall_service_definition, nil)){
+ ok = false;
+ y2error("Unable to write settings into sysconfig file %1", sysconfig_file);
+ }
+ if (!SCR::UnregisterAgent (.firewall_service_definition)){
+ ok = false;
+ y2error("Unable to unregister sysconfig agent for %1", sysconfig_file);
+ }
+ // write /etc/sysconfig/SuSEFirewall2.d/services/squid file:
+ /*
+ string service_squid_file =
+ "## Name: Squid Service\n" +
+ "## Description: Opens ports for Squid\n" +
+ "TCP=\"" + mergestring(GetHttpPortsOnly(), " ") +"\"\n";
+ if (!SCR::Write(.target.string, "/etc/sysconfig/SuSEfirewall2.d/services/squid", service_squid_file)){
+ y2error("Squid::writeFirewallSettings - failed to write into /etc/sysconfig/SuSEfirewall2.d/services/squid file.");
+ ok = false;
+ }
+ */
+
+ // write firewall settings
+ SuSEFirewall::SetModified();
+ Progress::set(false);
+ if (!SuSEFirewall::Write()){
+ y2error("Squid::writeFirewallSettings - SuSEFirewall::Write failed");
+ ok = false;
+ }
+ Progress::set(true);
+
+ return ok;
+}
/**
* Returns true if Squid service is running.
@@ -1291,16 +1393,20 @@
// We do not set help text here, because it was set outside
Progress::New(_("Saving Squid Configuration"),
" ",
- 2,
+ 3,
[
/* Progress stage 1/2 */
_("Write the settings"),
+ /* Progress stage 1/2 */
+ _("Write firewall settings"),
/* Progress stage 2/2 */
_("Start Service")
],
[
/* Progress step 1/2 */
_("Writing the settings..."),
+ /* Progress step 1/2 */
+ _("Writing firewall settings..."),
/* Progress step 2/2 */
_("Starting Service..."),
/* Progress finished */
@@ -1318,6 +1424,13 @@
ok = false;
}
+ //firewall
+ if (!writeFirewallSettings()){
+ Report::Error(_("Cannot write firewall settings."));
+ ok = false;
+ }
+ Progress::NextStage();
+
//enabling / disabling service
if (service_enabled_on_startup == true) EnableService();
if (service_enabled_on_startup == false) DisableService();
Modified: trunk/squid/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40836&r1=40835&r2=40836&view=diff
==============================================================================
--- trunk/squid/src/complex.ycp (original)
+++ trunk/squid/src/complex.ycp Mon Sep 10 16:14:41 2007
@@ -35,6 +35,7 @@
import "Confirm";
import "DialogTree";
import "CWMServiceStart";
+import "CWMFirewallInterfaces";
import "PackageSystem";
import "Squid";
import "Mode";
@@ -121,6 +122,12 @@
_("Save Settings and Restart Squid Now")
)
]),
+ "firewall" : CWMFirewallInterfaces::CreateOpenFirewallWidget($[
+ "services" : [Squid::GetFirewallServiceName],
+ "display_details" : true,
+ "open_firewall_checkbox" : _("Open Ports in Firewall")
+ ]),
+
"http_ports_table" : $[
"widget" : `custom,
@@ -193,13 +200,15 @@
map > screens = $[
"s1" : $[
- "widget_names" : ["auto_start", "start_stop"],
+ "widget_names" : ["auto_start", "start_stop", "firewall"],
"contents" : `HBox(
`HSpacing(3),
`Top(`VBox(
"auto_start",
`VSpacing(),
- (Mode::normal() ? "start_stop" : `Empty())
+ (Mode::normal() ? "start_stop" : `Empty()),
+ `VSpacing(),
+ `Frame(_("Firewall Settings"), "firewall")
)),
`HSpacing(3)
),
Modified: trunk/squid/yast2-squid.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/yast2-squid.spec.in?rev=40836&r1=40835&r2=40836&view=diff
==============================================================================
--- trunk/squid/yast2-squid.spec.in (original)
+++ trunk/squid/yast2-squid.spec.in Mon Sep 10 16:14:41 2007
@@ -1,7 +1,7 @@
@HEADER-COMMENT@
@HEADER@
-Requires: yast2
+Requires: yast2 filesystem
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildArchitectures: noarch
@@ -22,6 +22,7 @@
%files
%defattr(-,root,root)
%dir @yncludedir@/squid
+%config /etc/sysconfig/SuSEfirewall2.d/services/squid
@yncludedir@/squid/*
@clientdir@/squid.ycp
@clientdir@/squid_*.ycp
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
