[rancid] Fortigate OSPF MD5 key

[heasley]

Thu, Dec 08, 2016 at 06:45:44PM +0000, heasley:
> Thu, Dec 08, 2016 at 01:29:53PM -0500, Gerhard Mourani:
> > It doesn't, I've md5-key + auth-password now! worse then before.
> > 
> > I'm using Rancid version 3.2.11 and here my original lines:
> 
> $filter_osc isnt in 3.2 (besides that there never was a 3.2.11).  If you
> included that when you patched your script, I'm not sure what the result
> would be.  Otherwise, it looks like it should have worked for both cases.
> 
> if you can provide a .raw file, i can fix this more easily:
> export NOPIPE=YES
> fnrancid -dl hostname
> send hostname.raw to me as an attachment.
> 
> >         # filter cycling password encryption
> >         if (/^\s*(set [^\s]*)\s(enc\s[^\s]+)(.*)/i && $filter_pwds > 0 ) {
> >             ProcessHistory("ENC","","","#$1 ENC <removed> $3\n");
> >             next;
> >         }
> > 
> > Gerhard,

This appears to work:

Index: fnrancid.in
===================================================================
--- fnrancid.in	(revision 3460)
+++ fnrancid.in	(working copy)
@@ -228,9 +228,9 @@
 	    next;
 	}
 	# filter cycling password encryption
-	if (/^(\s*set \S*)\s(enc\s\S+)(.*)/i &&
+	if (/^(\s*set \S*( \d+)?)\s("?enc\s\S+"?)(.*)/i &&
 	    ($filter_osc || $filter_pwds > 0)) {
-	    ProcessHistory("ENC","","","#$1 ENC <removed> $3\n");
+	    ProcessHistory("ENC","","","#$1 ENC <removed> $4\n");
 	    next;
 	}
 	ProcessHistory("","","","$_");