diff --git a/prelude-lml-3.1.0.tar.gz b/prelude-lml-3.1.0.tar.gz deleted file mode 100644 index f0bc852..0000000 --- a/prelude-lml-3.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32a7e2256ae3b87b84b3da05b60fed0bb5e3b32e2f6794516c435eda1d753384 -size 1408600 diff --git a/prelude-lml-4.0.0.tar.gz b/prelude-lml-4.0.0.tar.gz new file mode 100644 index 0000000..6389d93 --- /dev/null +++ b/prelude-lml-4.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc12dcb8f1085694fff20801204f9350c2011f06fceeda3be03ec5a748ab4eef +size 1435446 diff --git a/prelude-lml-fix_check.patch b/prelude-lml-fix_check.patch new file mode 100644 index 0000000..403b984 --- /dev/null +++ b/prelude-lml-fix_check.patch @@ -0,0 +1,510 @@ +From: Thomas Andrejak +Date: 2017-10-04 07:00:00 +0100 +References: http://prelude-siem.org/issues/872 +Upstream: submitted +Subject: Fix make check + +diff -Nru src/file-server.c src/file-server.c +--- ./src/file-server.c 2016-09-15 08:49:20.170000884 +0200 ++++ ./src/file-server.c 2017-01-28 18:18:06.634761198 +0100 +@@ -346,6 +346,9 @@ + ssize_t ret; + struct stat st; + ++ if ( config.dry_run ) ++ return 0; ++ + if ( fstat(fileno(monitor->metadata_fd), &st) < 0 ) { + prelude_log(PRELUDE_LOG_WARN, "fstat failed : %s.\n", strerror(errno)); + return -1; +@@ -416,6 +419,9 @@ + off_t offset = 0, available = 65535; + unsigned char msum[METADATA_SIZE], *sumptr = msum; + ++ if ( config.dry_run ) ++ return 0; ++ + filename = lml_log_source_get_name(monitor->source); + + ret = file_metadata_read(monitor, &offset, &sumptr); +@@ -477,6 +483,9 @@ + int fd; + char file[PATH_MAX], path[PATH_MAX], *ptr; + ++ if ( config.dry_run ) ++ return 0; ++ + strncpy(file, lml_log_source_get_name(monitor->source), sizeof(file)); + + while ( (ptr = strchr(file, '/')) ) +diff -Nru src/prelude-lml.c src/prelude-lml.c +--- ./src/prelude-lml.c 2016-09-15 08:49:20.171000884 +0200 ++++ ./src/prelude-lml.c 2017-01-28 18:19:25.373006781 +0100 +@@ -361,6 +361,7 @@ + ev_timer evt; + struct timeval end; + struct sigaction action; ++ const char *env; + + /* + * Initialize libev. +@@ -389,7 +390,11 @@ + if ( ret < 0 ) + return ret; + +- ret = log_plugins_init(LOG_PLUGIN_DIR, lml_root_optlist); ++ env = getenv("PRELUDE_LML_PLUGIN_DIR"); ++ if ( !env ) ++ env = LOG_PLUGIN_DIR; ++ ++ ret = log_plugins_init(env, lml_root_optlist); + if (ret < 0) + return ret; + +diff -Nru src/regex.c src/regex.c +--- ./src/regex.c 2016-09-15 08:49:20.172000884 +0200 ++++ ./src/regex.c 2017-01-28 18:17:45.931222693 +0100 +@@ -156,16 +156,20 @@ + FILE *fd; + size_t len; + char buf[1024]; +- const char *errptr; ++ const char *errptr, *env; + int line = 0, erroff; + regex_table_item_t *rt; + pcre_extra *regex_regex_extra = NULL; + char *regex, *options, *source, *plugin; + pcre *regex_regex = NULL, *source_regex = NULL; + +- fd = fopen(REGEX_CONF, "r"); ++ env = getenv("PRELUDE_LML_REGEX_CONF"); ++ if ( !env ) ++ env = REGEX_CONF; ++ ++ fd = fopen(env, "r"); + if ( ! fd ) { +- prelude_log(PRELUDE_LOG_ERR, "couldn't open config file %s.\n", REGEX_CONF); ++ prelude_log(PRELUDE_LOG_ERR, "couldn't open config file %s.\n", env); + return -1; + } + +diff -Nru tests/Makefile.in tests/Makefile.in +--- ./tests/Makefile.in 2016-09-15 09:03:00.925000884 +0200 ++++ ./tests/Makefile.in 2017-01-28 18:22:00.268558881 +0100 +@@ -1362,7 +1362,10 @@ + cd $(top_srcdir)/prelude-lml && make + + check-am: +- $(srcdir)/loggrep.py $(top_srcdir)/plugins/pcre/ruleset/*.rules | $(top_srcdir)/src/prelude-lml --quiet --dry-run --metadata=nowrite,head --batch-mode --no-resolve --pcre --dump-unmatched --config $(srcdir)/prelude-lml.conf 2>&1 | $(GREP) -Fvf $(srcdir)/ignored ++ rm -rf plugins && mkdir plugins ++ cp $(top_srcdir)/plugins/*/.libs/*.so plugins ++ ./loggrep.py regex.test | PRELUDE_LML_PLUGIN_DIR=plugins PRELUDE_LML_REGEX_CONF=plugins.rules $(top_srcdir)/src/prelude-lml --quiet --dry-run --metadata=nowrite,head --batch-mode --no-resolve --pcre --dump-unmatched --config $(srcdir)/prelude-lml.conf 2>&1 | $(GREP) -Fvf $(srcdir)/ignored ++ rm -rf plugins + + -include $(top_srcdir)/git.mk + +diff -Nru tests/plugins.rules tests/plugins.rules +--- ./tests/plugins.rules 1970-01-01 01:00:00.000000000 +0100 ++++ ./tests/plugins.rules 2017-01-28 18:20:24.857682680 +0100 +@@ -0,0 +1 @@ ++ * Pcre - * +diff -Nru tests/prelude-lml.conf tests/prelude-lml.conf +--- ./tests/prelude-lml.conf 2016-09-15 08:49:20.172000884 +0200 ++++ ./tests/prelude-lml.conf 2017-01-28 18:20:30.037567378 +0100 +@@ -3,51 +3,5 @@ + prefix-regex = "^(?P.{15}) (?P\S+) (?:(?P\S+?)(?:\[(?P[0-9]+)\])?: )?" + file = - + +-[format=apache] +-time-format = "%d/%b/%Y:%H:%M:%S" +-prefix-regex = "(?P\S+) \S+ \S+ \[(?P.{20}) [+-].{4}\] " +-file = - +- +-[format=apache-error] +-#[Sat Mar 12 22:56:12 2005] [error] [client 127.0.0.1] +-time-format = "%a %b %d %H:%M:%S %Y" +-prefix-regex = "^\[(?P.{24})\]" +-file = - +- +-[format=checkpoint] +-time-format = "%d%b%Y %H:%M:%S" +-prefix-regex = "^(?P.{20})" +-file = - +- +-[format=squid] +-#2005/11/28 06:00:44| +-time-format = "%Y/%m/%d %H:%M:%S" +-prefix-regex = "^(?P.{19})\| " +-file = - +- +-[format=honeyd] +-#2006-08-18-12:21:12.1239 +-time-format = "%Y-%m-%d-%H:%M:%S" +-prefix-regex = "^(?P.{19})\." +-file = - +- +-[format=honeytrap] +-#[2007-05-26 16:48:09] +-time-format = "%Y-%m-%d %H:%M:%S" +-prefix-regex = "^\[(?P.{19})\]" +-file = - +- +-[format=kojoney] +-#2007/04/12 21:57 CEST +-time-format = "%Y/%m/%d %H:%M" +-prefix-regex = "^(?P.{16}) " +-file = - +- +-[format=rishi] +-#2007-05-20 12:49:57,644 +-time-format = "%Y-%m-%d %H:%M:%S" +-prefix-regex = "^(?P.{19})," +-file = - +- + [Pcre] +-ruleset=../plugins/pcre/ruleset/pcre.rules ++ruleset=./regex.test +diff -Nru tests/regex.test tests/regex.test +--- ./tests/regex.test 1970-01-01 01:00:00.000000000 +0100 ++++ ./tests/regex.test 2017-01-28 18:20:17.921837067 +0100 +@@ -0,0 +1,340 @@ ++#FULLNAME: SSH ++#VERSION: 1.0 ++#DESCRIPTION: SSH, is a cryptographic (encrypted) network protocol to allow remote login and other network services to operate securely over an unsecured network. ++ ++##### ++# ++# Copyright (C) 2002,2004 Nicolas Delon ++# Copyright (C) 2005 G Ramon Gomez ++# All Rights Reserved ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program; if not, write to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++##### ++ ++################### ++# Logging succeed # ++################### ++ ++#LOG:Dec 8 14:45:17 itguxweb1 sshd[32112]: Accepted publickey for root from 12.34.56.78 port 56634 ssh2 ++regex=for root from|user root; \ ++ id=1907; \ ++ assessment.impact.type=admin; \ ++ assessment.impact.severity=medium; \ ++ silent; chained ++ ++#LOG:Dec 8 14:45:17 itguxweb1 sshd[32112]: Accepted publickey for root from 12.34.56.78 port 56634 ssh2 ++#LOG:Jan 14 03:30:44 mail sshd[20298]: Accepted publickey for root from fec0:0:201::3 port 63018 ssh2 ++#LOG:Jan 14 03:30:44 mail sshd[20298]: Accepted publickey for john from fec0:0:201::3 port 63018 ssh2 ++#LOG:Dec 10 10:33:19 itguxweb2 sshd[29738]: Accepted password for ekwong from 12.34.56.78 port 39852 ssh2 ++regex=Accepted (\S+) for (\S+) from (\S+) port (\d+); \ ++ classification.text=Remote Login; \ ++ optgoto=1907; \ ++ id=1908; \ ++ revision=3; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=low; \ ++ assessment.impact.completion=succeeded; \ ++ assessment.impact.type=user; \ ++ assessment.impact.description=User $2 logged in from $3 port $4 using the $1 method; \ ++ source(0).node.address(0).address=$3; \ ++ source(0).service.port=$4; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ target(0).user.user_id(0).type=target-user; \ ++ target(0).user.user_id(0).name=$2; \ ++ additional_data(0).type=string; \ ++ additional_data(0).meaning=Authentication method; \ ++ additional_data(0).data=$1; \ ++ last; ++ ++ ++################ ++# Login failed # ++################ ++ ++#LOG:Dec 9 16:00:35 itguxweb2 sshd[24541]: Failed password for root from 12.34.56.78 port 1806 ++#LOG:Dec 9 21:29:56 devel5 sshd[17554]: Failed password for akarade from 12.34.56.78 port 4214 ++regex=Failed (\S+) for (\S+) from (\S+) port (\d+); \ ++ optgoto=1907; \ ++ classification.text=Remote Login; \ ++ id=1902; \ ++ revision=3; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=user; \ ++ assessment.impact.description=Someone tried to login as $2 from $3 port $4 using the $1 method; \ ++ source(0).node.address(0).address=$3; \ ++ source(0).service.port=$4; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ target(0).user.user_id(0).type=target-user; \ ++ target(0).user.user_id(0).name=$2; \ ++ additional_data(0).type=string; \ ++ additional_data(0).meaning=Authentication method; \ ++ additional_data(0).data=$1; \ ++ last ++ ++ ++############################################## ++# Invalid (not existing) user tried to login # ++############################################## ++ ++#LOG:Jan 20 14:10:02 blah sshd[25443]: Invalid user admin from 213.201.222.134 ++regex=(Illegal|Invalid) user (\S+) from (\S+); \ ++ classification.text=User login failed with an invalid user; \ ++ id=1904; \ ++ revision=2; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=user; \ ++ assessment.impact.description=Someone tried to login with the invalid user "$2" from $3; \ ++ source(0).node.address(0).address=$3; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ target(0).user.user_id(0).type=target-user; \ ++ target(0).user.user_id(0).name=$2; \ ++ last ++ ++################################################################################## ++# User listed in DenyGroups or DenyUsers (sshd_config directives) tried to login # ++################################################################################## ++ ++#LOG:Jan 6 22:50:24 localhost sshd[15489]: User nobody not allowed because none of user's groups are listed in AllowGroups ++regex=User (\S+) not allowed because (.*)listed in (\w+); \ ++ classification.text=User login failed with a denied user; \ ++ id=1905; \ ++ revision=3; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=user; \ ++ assessment.impact.description=User $1 failed to login because $2 listed in $3; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ target(0).user.user_id(0).type=target-user; \ ++ target(0).user.user_id(0).name=$1; \ ++ additional_data(0).type=string; \ ++ additional_data(0).meaning=ACL; \ ++ additional_data(0).data=$3; \ ++ additional_data(1).type=string; \ ++ additional_data(1).meaning=Failure reason; \ ++ additional_data(1).data=$2 listed in $3; \ ++ last ++ ++################################################################## ++# Sshd did not receive the identification string from the client # ++# (maybe a ssh server recognition) # ++################################################################## ++ ++#LOG:Jun 10 09:51:57 server sshd[9100]: Did not receive identification string from 1.2.3.4 ++regex=Did not receive identification string from (\S+); \ ++ classification.text=Server recognition; \ ++ id=1906; \ ++ revision=2; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=recon; \ ++ assessment.impact.description=$1 is probably making a server recognition; \ ++ source(0).node.address(0).address=$1; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ additional_data(0).type=string; \ ++ additional_data(0).meaning=Failure reason; \ ++ additional_data(0).data=Did not receive identification string; \ ++ last ++ ++######################################################################### ++# Forbidden root login # ++# (directive PermitRootLogin and keyword "no" or "forced-commands-only" # ++# of the sshd_config file) # ++######################################################################### ++ ++#LOG:Jan 5 01:31:41 www sshd[1643]: ROOT LOGIN REFUSED FROM 1.2.3.4 ++regex=ROOT LOGIN REFUSED FROM (\S+); \ ++ classification.text=Admin login; \ ++ id=1909; \ ++ revision=2; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=admin; \ ++ assessment.impact.description=Root tried to login while it is forbidden; \ ++ source(0).node.address(0).address=$1; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ target(0).user.user_id(0).type=target-user; \ ++ target(0).user.user_id(0).name=root; \ ++ last ++ ++ ++# Re: Generic Message Exchange Authentication For SSH ++# ++#LOG:Jan 14 08:19:21 ras sshd[22774]: input_userauth_request: invalid user remote-mail ++regex=input_userauth_request: (illegal|invalid) user (\S+); \ ++ classification.text=Invalid user in authentication request; \ ++ id=1910; \ ++ revision=3; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=user; \ ++ assessment.impact.description=General purpose authentication request was blocked. Reason: invalid user $2; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ target(0).user.user_id(0).type=target-user; \ ++ target(0).user.user_id(0).name=$2; \ ++ additional_data(0).type=string; \ ++ additional_data(0).meaning=Failure reason; \ ++ additional_data(0).data=$1 user; \ ++ last ++ ++# Re: Generic Message Exchange Authentication For SSH ++# ++# This rule catches several other combinations that can be output by ++# input_userauth_request() in auth2.c ++#LOG:Jan 14 08:19:21 ras sshd[22774]: input_userauth_request: invalid user remote-mail ++regex=input_userauth_request: (.+); \ ++ classification.text=Invalid user in authentication request; \ ++ id=1911; \ ++ revision=2; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=user; \ ++ assessment.impact.description=General purpose authentication request was blocked. Reason: $1; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ last ++ ++#LOG:Dec 9 18:48:29 itguxweb2 sshd[29536]: Failed password for illegal user ROOT from 12.34.56.78 port 2886 ++#LOG:Jan 14 08:19:21 ras sshd[22774]: Failed none for invalid user remote-mail from 192.168.1.22 port 65407 ssh2 ++#LOG:Jan 14 11:29:17 ras sshd[18163]: Failed publickey for invalid user fred from fec0:0:201::3 port 62788 ssh2 ++#LOG:Jan 14 11:29:17 ras sshd[18163]: Failed publickey for invalid user fred from 1.2.3.4 port 62788 ssh2 ++#LOG:Jan 14 11:29:17 ras sshd[18163]: Failed publickey for invalid user fred from hostname port 62788 ssh2 ++regex=Failed (\S+) for (illegal|invalid) user (\S+) from (\S+) port (\d+); \ ++ classification.text=Remote Login; \ ++ optgoto=1907; \ ++ id=1912; \ ++ revision=3; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=admin; \ ++ assessment.impact.description=Someone tried to login as $3 from $4 port $5 using the $1 method; \ ++ source(0).node.address(0).address=$4; \ ++ source(0).service.port=$5; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ target(0).user.user_id(0).type=target-user; \ ++ target(0).user.user_id(0).name=$3; \ ++ additional_data(0).type=string; \ ++ additional_data(0).meaning=Authentication method; \ ++ additional_data(0).data=$1; \ ++ additional_data(1).type=string; \ ++ additional_data(1).meaning=Failure reason; \ ++ additional_data(1).data=$2 user; \ ++ last ++ ++#LOG:Oct 2 14:40:05 suse-9.2 sshd[18725]: error: PAM: Authentication failure for root from unknown.anywhere.net ++#LOG:Oct 2 14:46:52 suse-9.2 sshd[18804]: error: PAM: Authentication failure for foobar from unknown.anywhere.net ++regex=error: PAM: Authentication failure for (\S+) from (\S+); \ ++ classification.text=Remote Login; \ ++ optgoto=1907; \ ++ id=1914; \ ++ revision=2; \ ++ analyzer(0).name=sshd; \ ++ analyzer(0).manufacturer=OpenSSH; \ ++ analyzer(0).class=Authentication; \ ++ assessment.impact.severity=medium; \ ++ assessment.impact.completion=failed; \ ++ assessment.impact.type=user; \ ++ assessment.impact.description=Someone tried to login as $1 from $2; \ ++ source(0).node.name=$2; \ ++ source(0).service.iana_protocol_name=tcp; \ ++ source(0).service.iana_protocol_number=6; \ ++ target(0).service.port=22; \ ++ target(0).service.name=ssh; \ ++ target(0).service.iana_protocol_name=tcp; \ ++ target(0).service.iana_protocol_number=6; \ ++ target(0).user.category=os-device; \ ++ target(0).user.user_id(0).type=target-user; \ ++ target(0).user.user_id(0).name=$1; \ ++ last diff --git a/prelude-lml-fix_etc_perms.patch b/prelude-lml-fix_etc_perms.patch new file mode 100644 index 0000000..e4f6376 --- /dev/null +++ b/prelude-lml-fix_etc_perms.patch @@ -0,0 +1,45 @@ +From: Thomas Andrejak +Date: 2017-10-04 07:00:00 +0100 +References: http://prelude-siem.org/issues/870 +Upstream: submitted +Subject: Fix Prelude LML dirs permissions + +--- ./Makefile.in 2016-09-15 09:03:01.116000884 +0200 ++++ ./Makefile.in 2017-01-26 07:38:35.217447516 +0100 +@@ -1762,9 +1762,9 @@ + + + install-data-local: +- $(INSTALL) -m 700 -d $(DESTDIR)$(configdir); +- $(INSTALL) -m 700 -d $(DESTDIR)$(lml_run_dir); +- $(INSTALL) -m 700 -d $(DESTDIR)$(metadata_dir) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(configdir); ++ $(INSTALL) -m 755 -d $(DESTDIR)$(lml_run_dir); ++ $(INSTALL) -m 755 -d $(DESTDIR)$(metadata_dir) + @if test -f $(DESTDIR)$(configdir)/prelude-lml.conf; then \ + echo "********************************************************************************"; \ + echo; \ +@@ -1772,9 +1772,9 @@ + echo "Installing default configuration in $(DESTDIR)$(configdir)/prelude-lml.conf-dist"; \ + echo; \ + echo "********************************************************************************"; \ +- $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/prelude-lml.conf-dist; \ ++ $(INSTALL) -m 644 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/prelude-lml.conf-dist; \ + else \ +- $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/; \ ++ $(INSTALL) -m 644 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/; \ + fi + @if test -f $(DESTDIR)$(configdir)/plugins.rules; then \ + echo "********************************************************************************"; \ +@@ -1783,9 +1783,9 @@ + echo "Installing default configuration in $(DESTDIR)$(configdir)/plugins.rules-dist"; \ + echo; \ + echo "********************************************************************************"; \ +- $(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/plugins.rules-dist; \ ++ $(INSTALL) -m 644 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/plugins.rules-dist; \ + else \ +- $(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/; \ ++ $(INSTALL) -m 644 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/; \ + fi + + uninstall-local: diff --git a/prelude-lml-tmpfiles.conf b/prelude-lml-tmpfiles.conf new file mode 100644 index 0000000..f6f1296 --- /dev/null +++ b/prelude-lml-tmpfiles.conf @@ -0,0 +1 @@ +d /run/prelude-lml 0750 root root diff --git a/prelude-lml.changes b/prelude-lml.changes index 09bfef0..dd628bd 100644 --- a/prelude-lml.changes +++ b/prelude-lml.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 04 07:00:00 UTC 2017 - thomas.andrejak@gmail.com + +- Update to 4.0.0 +- Rename source prelude-lml.run to prelude-lml-tmpfiles.conf +- Clean prelude-lml.service +- Add patchs: + - prelude-lml-fix_check.patch: Fix make check + - prelude-lml-fix_etc_perms.patch: Fix Prelude LML dirs permissions + ------------------------------------------------------------------- Thu Mar 23 14:41:36 UTC 2017 - aj@ajaissle.de diff --git a/prelude-lml.run b/prelude-lml.run deleted file mode 100644 index 964c152..0000000 --- a/prelude-lml.run +++ /dev/null @@ -1,2 +0,0 @@ -# create a directory with permissions 0770 owned by user foo and group bar -d /run/prelude-lml 0750 root root diff --git a/prelude-lml.service b/prelude-lml.service index 540fd4c..6f3e447 100644 --- a/prelude-lml.service +++ b/prelude-lml.service @@ -1,13 +1,9 @@ [Unit] -Description=Prelude-LML service -DefaultDependencies=no +Description=Log analyzer sensor with IDMEF output After=remode_fs.target prelude-manager.service [Service] -ExecStart=/usr/bin/prelude-lml -d -P /run/prelude-lml/prelude-lml.pid -Type=forking -PIDFile=/run/prelude-lml/prelude-lml.pid -Restart=always +ExecStart=/usr/bin/prelude-lml [Install] - +WantedBy=multi-user.target diff --git a/prelude-lml.spec b/prelude-lml.spec index 492e2eb..46ce3d9 100644 --- a/prelude-lml.spec +++ b/prelude-lml.spec @@ -17,20 +17,24 @@ Name: prelude-lml -Version: 3.1.0 +Version: 4.0.0 Release: 0 Summary: The prelude log analyzer +License: GPL-2.0+ and LGPL-2.1 and GPL-3.0+ +Group: System/Daemons # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ # libmissing/test is GPL-3.0+ -License: GPL-2.0+ and LGPL-2.1 and GPL-3.0+ -Group: System/Daemons Url: https://www.prelude-siem.org Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz Source1: %{name}.service -Source2: %{name}.run +Source2: %{name}-tmpfiles.conf # Add default syslog format to work out of the box Patch0: %{name}-conf_rsyslog.patch +# Fix make check +Patch1: %{name}-fix_check.patch +# Fix etc files permissions +Patch2: %{name}-fix_etc_perms.patch BuildRequires: gamin-devel BuildRequires: libprelude-devel BuildRequires: pcre-devel @@ -57,6 +61,8 @@ Prelude LML plugins. %prep %setup -q %patch0 +%patch1 +%patch2 %build %configure