[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f2f0d61fc1ecaff1f13ece1c0f85d2adbe2ba347

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2310 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  f2f0d61fc1ecaff1f13ece1c0f85d2adbe2ba347 (commit)
      from  89f634ff9ed358a72c28330f643d5c128bc21b20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f2f0d61fc1ecaff1f13ece1c0f85d2adbe2ba347
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Aug 14 12:01:53 2018 +0200

    logs.cgi/ids.dat: Rework linking to external rule documentation.
    
    Check if the sid of a rule belongs to sourcefire and link to the
    changed URL for gathering more details. If the sid of the rule belongs
    to emergingthreads now link to the emergingthreads documentation.
    
    Fixes #11806.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/logs.cgi/ids.dat | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat
index 98176d690..030fd4b64 100644
--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -335,10 +335,18 @@ print <<END
 <td valign='top'>
 END
 	;
-	if ($sid ne "n/a") {
-		print "<a href='https://www.snort.org/rule_docs/$sid' ";
+	if ($sid eq "n/a") {
+		print $sid;
+	} elsif ($sid < 1000000) {
+		# Link to sourcefire if the the rule sid is less than 1000000.
+		print "<a href='https://www.snort.org/rule_docs/1-$sid' ";
+		print "target='_blank'>$sid</a></td>\n";
+	} elsif ($sid >= 2000000 and $sid < 3000000) {
+		# Link to emergingthreats if the rule sid is between 2000000 and 3000000.
+		print "<a href='http://doc.emergingthreats.net/$sid' ";
 		print "target='_blank'>$sid</a></td>\n";
 	} else {
+		# No external link for user defined rules
 		print $sid;
 	}
 print <<END


hooks/post-receive
--
IPFire 2.x development tree