Hello community,
here is the log from the commit of package yast2-ftp-server for
openSUSE:Factory checked in at 2014-08-25 11:04:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ftp-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-ftp-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ftp-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes
2014-08-08 10:13:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new/yast2-ftp-server.changes
2014-08-25 11:05:24.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 20 09:25:51 UTC 2014 - c...@suse.com
+
+- Using different defaults about logging for vsftpd/pure-ftpd (bnc#888287)
+- Setting xferlog_enable = YES instead of syslog_enable
+- 3.1.3
+
+-------------------------------------------------------------------
Old:
----
yast2-ftp-server-3.1.2.tar.bz2
New:
----
yast2-ftp-server-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ftp-server.spec ++++++
--- /var/tmp/diff_new_pack.wpdDuF/_old 2014-08-25 11:05:25.000000000 +0200
+++ /var/tmp/diff_new_pack.wpdDuF/_new 2014-08-25 11:05:25.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-ftp-server
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-ftp-server-3.1.2.tar.bz2 -> yast2-ftp-server-3.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ftp-server-3.1.2/package/yast2-ftp-server.changes
new/yast2-ftp-server-3.1.3/package/yast2-ftp-server.changes
--- old/yast2-ftp-server-3.1.2/package/yast2-ftp-server.changes 2014-08-05
10:49:01.000000000 +0200
+++ new/yast2-ftp-server-3.1.3/package/yast2-ftp-server.changes 2014-08-22
16:34:17.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Aug 20 09:25:51 UTC 2014 - c...@suse.com
+
+- Using different defaults about logging for vsftpd/pure-ftpd (bnc#888287)
+- Setting xferlog_enable = YES instead of syslog_enable
+- 3.1.3
+
+-------------------------------------------------------------------
Fri Aug 1 12:51:37 UTC 2014 - mvid...@suse.com
- Enabled YARD docs, documented the basics of FtpServer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ftp-server-3.1.2/package/yast2-ftp-server.spec
new/yast2-ftp-server-3.1.3/package/yast2-ftp-server.spec
--- old/yast2-ftp-server-3.1.2/package/yast2-ftp-server.spec 2014-08-05
10:49:01.000000000 +0200
+++ new/yast2-ftp-server-3.1.3/package/yast2-ftp-server.spec 2014-08-22
16:34:17.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-ftp-server
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ftp-server-3.1.2/src/include/ftp-server/write_load.rb
new/yast2-ftp-server-3.1.3/src/include/ftp-server/write_load.rb
--- old/yast2-ftp-server-3.1.2/src/include/ftp-server/write_load.rb
2014-08-05 10:49:01.000000000 +0200
+++ new/yast2-ftp-server-3.1.3/src/include/ftp-server/write_load.rb
2014-08-22 16:34:17.000000000 +0200
@@ -519,32 +519,16 @@
when "VerboseLogging"
if @vsftpd_edit
if write
- Ops.set(
- @VS_SETTINGS,
- "log_ftp_protocol",
- Ops.get(@EDIT_SETTINGS, "VerboseLogging")
- )
- Ops.set(
- @VS_SETTINGS,
- "syslog_enable",
- Ops.get(@EDIT_SETTINGS, "VerboseLogging")
- )
+ @VS_SETTINGS["log_ftp_protocol"] =
@EDIT_SETTINGS["VerboseLogging"]
+ @VS_SETTINGS["xferlog_enable"] = @EDIT_SETTINGS["VerboseLogging"]
else
- return Builtins.haskey(@VS_SETTINGS, "log_ftp_protocol") ?
- Builtins.toupper(Ops.get(@VS_SETTINGS, "log_ftp_protocol")) :
- Ops.get(@DEFAULT_CONFIG, "VerboseLogging")
+ return (@VS_SETTINGS["log_ftp_protocol"] ||
@DEFAULT_CONFIG["log_ftp_protocol"]).upcase
end
else
if write
- Ops.set(
- @PURE_SETTINGS,
- "VerboseLog",
- Ops.get(@EDIT_SETTINGS, "VerboseLogging")
- )
+ @PURE_SETTINGS["VerboseLog"] = @EDIT_SETTINGS["VerboseLogging"]
else
- return Builtins.haskey(@PURE_SETTINGS, "VerboseLog") ?
- Builtins.toupper(Ops.get(@PURE_SETTINGS, "VerboseLog")) :
- Ops.get(@DEFAULT_CONFIG, "VerboseLogging")
+ return (@PURE_SETTINGS["VerboseLog"] ||
@DEFAULT_CONFIG["VerboseLogging"]).upcase
end
end
when "FtpDirLocal"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ftp-server-3.1.2/src/modules/FtpServer.rb
new/yast2-ftp-server-3.1.3/src/modules/FtpServer.rb
--- old/yast2-ftp-server-3.1.2/src/modules/FtpServer.rb 2014-08-05
10:49:01.000000000 +0200
+++ new/yast2-ftp-server-3.1.3/src/modules/FtpServer.rb 2014-08-22
16:34:17.000000000 +0200
@@ -194,7 +194,8 @@
@DEFAULT_CONFIG = {
"ChrootEnable" => "NO",
- "VerboseLogging" => "NO",
+ "VerboseLogging" => "NO", # Default value for pure-ftpd.
+ "log_ftp_protocol" => "YES", # Default value for vsftp (bnc#888287).
"FtpDirLocal" => "", #if empty doesn't write this options via SCR
"FtpDirAnon" => "", #if empty doesn't write this options via SCR
"Umask" => "",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ftp-server-3.1.2/test/verbose_logging_test.rb
new/yast2-ftp-server-3.1.3/test/verbose_logging_test.rb
--- old/yast2-ftp-server-3.1.2/test/verbose_logging_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-ftp-server-3.1.3/test/verbose_logging_test.rb 2014-08-22
16:34:17.000000000 +0200
@@ -0,0 +1,126 @@
+#! /usr/bin/env rspec
+
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require "yast"
+
+Yast.import "FtpServer"
+
+VS_CONFIG_PATH = Yast::Path.new(".vsftpd")
+PURE_CONFIG_PATH = Yast::Path.new(".pure-ftpd")
+
+def mock_config(config_path, map)
+ allow(Yast::SCR).to receive(:Dir).with(config_path).and_return(map.keys)
+ map.each_pair do |key, value|
+ allow(Yast::SCR).to receive(:Read).with(config_path +
key).and_return(value)
+ end
+end
+
+VS_SETTINGS = {
+ "write_enable" => "NO",
+ "dirmessage_enable" => "YES",
+ "nopriv_user" => "ftpsecure",
+ "local_enable" => "YES",
+ "anonymous_enable" => "YES",
+ "anon_world_readable_only" => "YES",
+ "syslog_enable" => "YES",
+ "connect_from_port_20" => "YES",
+ "ascii_upload_enable" => "YES",
+ "pam_service_name" => "vsftpd",
+ "listen" => "NO",
+ "listen_ipv6" => "YES",
+ "ssl_enable" => "NO",
+ "pasv_min_port" => "30000",
+ "pasv_max_port" => "30100"
+}
+
+PURE_SETTINGS = {
+ "AllowAnonymousFXP" => "no",
+ "AllowDotFiles" => "yes",
+ "AllowUserFXP" => "no",
+ "AnonymousCanCreateDirs" => "no",
+ "AnonymousCantUpload" => "yes",
+ "AnonymousOnly" => "yes",
+ "AntiWarez" => "yes",
+ "AutoRename" => "yes",
+ "BrokenClientsCompatibility" => "no",
+ "ChrootEveryone" => "yes",
+ "CustomerProof" => "yes",
+ "Daemonize" => "no",
+ "DisplayDotFiles" => "yes",
+ "DontResolve" => "yes",
+ "LimitRecursion" => "10000 8",
+ "MaxClientsNumber" => "10",
+ "MaxClientsPerIP" => "3",
+ "MaxDiskUsage" => "99",
+ "MaxIdleTime" => "15",
+ "MaxLoad" => "4",
+ "MinUID" => "40",
+ "NoAnonymous" => "no",
+ "NoRename" => "yes",
+ "PAMAuthentication" => "yes",
+ "PassivePortRange" => "30000 30100",
+ "ProhibitDotFilesRead" => "no",
+ "ProhibitDotFilesWrite" => "yes",
+ "SyslogFacility" => "ftp",
+ "VerboseLog" => "no"
+}
+
+describe "Yast::FtpServer" do
+ describe "#ValueUI" do
+ context "'VerboseLogging' when getting vsftpd settings" do
+ before do
+ Yast::FtpServer.vsftpd_edit = true
+ end
+
+ it "returns default value 'YES' if 'log_ftp_protocol' missing in config
file" do
+ mock_config(VS_CONFIG_PATH, VS_SETTINGS)
+ Yast::FtpServer.ReadVSFTPDSettings()
+
+ expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES"
+ end
+
+ it "returns value from config file 'NO' if 'log_ftp_protocol = NO' in
config file" do
+ mock_config(VS_CONFIG_PATH, VS_SETTINGS.merge("log_ftp_protocol" =>
"NO"))
+ Yast::FtpServer.ReadVSFTPDSettings()
+
+ expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO"
+ end
+
+ it "returns value from config file 'YES' if 'log_ftp_protocol = YES' in
config file" do
+ mock_config(VS_CONFIG_PATH, VS_SETTINGS.merge("log_ftp_protocol" =>
"YES"))
+ Yast::FtpServer.ReadVSFTPDSettings()
+
+ expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES"
+ end
+ end
+
+ context "'VerboseLogging' when getting pure-ftpd settings" do
+ before do
+ Yast::FtpServer.vsftpd_edit = false
+ end
+
+ it "returns default value 'NO' if config file empty" do
+ mock_config(PURE_CONFIG_PATH, {})
+ Yast::FtpServer.ReadPUREFTPDSettings()
+
+ expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO"
+ end
+
+ it "returns value from config file 'NO' if 'VerboseLog = no' in config
file" do
+ mock_config(PURE_CONFIG_PATH, PURE_SETTINGS)
+ Yast::FtpServer.ReadPUREFTPDSettings()
+
+ expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO"
+ end
+
+ it "returns value from config file 'YES' if 'VerboseLog = yes' in config
file" do
+ mock_config(PURE_CONFIG_PATH, PURE_SETTINGS.merge("VerboseLog" =>
"YES"))
+ Yast::FtpServer.ReadPUREFTPDSettings()
+
+ expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES"
+ end
+ end
+
+ end
+end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
