Widget Firewall Logs Filtering
-
Any chance you can put these on github in the form of a pull request?
It makes it much easier for us to test and import them into the main repository.
https://github.com/bsdperimeter/pfsense
https://help.github.com/articles/using-pull-requestsWould be glad too. I've never done anything with github though. So if you can teach me? I can do.
-
Any chance you can put these on github in the form of a pull request?
It makes it much easier for us to test and import them into the main repository.
https://github.com/bsdperimeter/pfsense
https://help.github.com/articles/using-pull-requestsWould be glad too. I've never done anything with github though. So if you can teach me? I can do.
ARRRRG
Someone already has my NOYB id at github. :(
Not cool! Not cool at all! -
Okay think I walked myself through the githup fork, edit, commit, and pull request process. Don't know if I did it correctly or the best way, but did do something and looks like there is a pull request pending anyway.
Let me know if that is correct way to go about this or if there is better way. Would prefer to just upload my patch file rather than forking, editing, and committing. Guess that's okay for a file or two, but this involves 11 files. Hope I got them all.
:)
-
You did these pull requests on master repo(pfsense 2.1), did you tested on 2.1 too?
-
You did these pull requests on master repo(pfsense 2.1), did you tested on 2.1 too?
No. But that is where the link jimp provided took me.
I'm only running 2.0.1.Did I do this wrong?
-
You did these pull requests on master repo(pfsense 2.1), did you tested on 2.1 too?
I tested them on my 2.1 box yesteday.. Worked fine for me… Used system patch package to apply the patch
-
Looks like there were a couple things not quite right in that pull request.
It might help if you apply it against the files on 2.0, make a single diff there, then switch to the 2.1 code and re-apply the diff. Alternately, commit it to the RELENG_2_0 branch in your fork, then cherry-pick the commit from RELENG_2_0 to master, then submit a request to pull from your master branch…
I believe all of that should be covered under the github link I gave before, they have a lot of good docs there about working with forks and branches.
-
i've noticed an issue with 2.1. Its not formatting the log correctly for IPv6 address
i've attach screenshots
-
i've noticed an issue with 2.1. Its not formatting the log correctly for IPv6 address
i've attach screenshots
Try this patch
(attached)Attachement Removed - Malformed Patch
-
it wouldn't apply :-(
-
This patch doesnt seem to work, or is there something I am missing?
Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/widgets/widgets/log.widget.php 2011-09-13 13:02:36.000000000 -0700 |+++ /usr/local/www/widgets/widgets/log.widget.php.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:42:05.000000000 -0700 -------------------------- Patching file /usr/local/www/widgets/widgets/log.widget.php using Plan A... Hunk #1 failed at 41. Hunk #2 failed at 73. Hunk #3 failed at 112. Hunk #4 failed at 138. 4 out of 4 hunks failed--saving rejects to /usr/local/www/widgets/widgets/log.widget.php.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/javascript/filter_log.js 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/javascript/filter_log.js.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 19:10:10.000000000 -0700 -------------------------- Patching file /usr/local/www/javascript/filter_log.js using Plan A... Hunk #1 failed at 61. 1 out of 1 hunks failed--saving rejects to /usr/local/www/javascript/filter_log.js.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /etc/inc/filter_log.inc 2011-12-12 13:55:12.000000000 -0800 |+++ /etc/inc/filter_log.inc.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 19:09:38.000000000 -0700 -------------------------- Patching file /etc/inc/filter_log.inc using Plan A... Hunk #1 failed at 69. Hunk #2 failed at 87. Hunk #3 failed at 286. 3 out of 3 hunks failed--saving rejects to /etc/inc/filter_log.inc.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/_corporate/all.css 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/themes/_corporate/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:20:12.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/_corporate/all.css using Plan A... Hunk #1 failed at 935. Hunk #2 failed at 1096. Hunk #3 failed at 1132. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/_corporate/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/code-red/all.css 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/themes/code-red/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:19:06.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/code-red/all.css using Plan A... Hunk #1 failed at 1018. Hunk #2 failed at 1180. Hunk #3 failed at 1216. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/code-red/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/metallic/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/metallic/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:17:43.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/metallic/all.css using Plan A... Hunk #1 failed at 986. Hunk #2 failed at 1149. Hunk #3 failed at 1185. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/metallic/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/nervecenter/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/nervecenter/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:16:12.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/nervecenter/all.css using Plan A... Hunk #1 failed at 1018. Hunk #2 failed at 1180. Hunk #3 failed at 1216. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/nervecenter/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/pfsense/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:08:02.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense/all.css using Plan A... Hunk #1 failed at 808. Hunk #2 failed at 844. 2 out of 2 hunks failed--saving rejects to /usr/local/www/themes/pfsense/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense_ng/all.css 2012-06-21 20:14:57.522797000 -0700 |+++ /usr/local/www/themes/pfsense_ng/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 20:51:49.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense_ng/all.css using Plan A... Hunk #1 failed at 1116. Hunk #2 failed at 1278. Hunk #3 failed at 1314. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/pfsense_ng/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense-dropdown/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/pfsense-dropdown/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:10:04.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense-dropdown/all.css using Plan A... Hunk #1 failed at 898. patch: **** malformed patch at line 518: div#log span.log-source-mini, -
the patch package wouldn't apply it. it allows you to test a patch before applying.. I'm thinking somthing change after you created the patch so it wont apply. Going to look deeper later
i forgot to include its log:
his page allows you to add patches, either from the official code repository or ones pasted in from e-mail or other sources. Use with caution! Output of full patch apply test: /usr/bin/patch --directory=/ -t -p0 -i /var/patches/50054c7502cc9.patch --check --forward Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/widgets/widgets/log.widget.php 2011-09-13 13:02:36.000000000 -0700 |+++ /usr/local/www/widgets/widgets/log.widget.php.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:42:05.000000000 -0700 -------------------------- Patching file /usr/local/www/widgets/widgets/log.widget.php using Plan A... Hunk #1 succeeded at 41. Hunk #2 succeeded at 73. Hunk #3 succeeded at 112. Hunk #4 succeeded at 138. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/javascript/filter_log.js 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/javascript/filter_log.js.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 19:10:10.000000000 -0700 -------------------------- Patching file /usr/local/www/javascript/filter_log.js using Plan A... Hunk #1 succeeded at 61. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /etc/inc/filter_log.inc 2011-12-12 13:55:12.000000000 -0800 |+++ /etc/inc/filter_log.inc.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 19:09:38.000000000 -0700 -------------------------- Patching file /etc/inc/filter_log.inc using Plan A... Hunk #1 succeeded at 69. Hunk #2 succeeded at 87. Hunk #3 succeeded at 290 (offset 4 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/_corporate/all.css 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/themes/_corporate/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:20:12.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/_corporate/all.css using Plan A... Hunk #1 succeeded at 935. Hunk #2 succeeded at 1096. Hunk #3 succeeded at 1132. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/code-red/all.css 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/themes/code-red/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:19:06.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/code-red/all.css using Plan A... Hunk #1 succeeded at 1020 (offset 2 lines). Hunk #2 succeeded at 1182 (offset 2 lines). Hunk #3 succeeded at 1218 (offset 2 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/metallic/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/metallic/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:17:43.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/metallic/all.css using Plan A... Hunk #1 succeeded at 987 (offset 1 line). Hunk #2 succeeded at 1150 (offset 1 line). Hunk #3 succeeded at 1186 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/nervecenter/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/nervecenter/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:16:12.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/nervecenter/all.css using Plan A... Hunk #1 succeeded at 1019 (offset 1 line). Hunk #2 succeeded at 1181 (offset 1 line). Hunk #3 succeeded at 1217 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/pfsense/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:08:02.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense/all.css using Plan A... Hunk #1 succeeded at 809 (offset 1 line). Hunk #2 succeeded at 845 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense_ng/all.css 2012-06-21 20:14:57.522797000 -0700 |+++ /usr/local/www/themes/pfsense_ng/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 20:51:49.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense_ng/all.css using Plan A... Hunk #1 succeeded at 1130 (offset 14 lines). Hunk #2 succeeded at 1292 (offset 14 lines). Hunk #3 succeeded at 1328 (offset 14 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense-dropdown/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/pfsense-dropdown/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:10:04.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense-dropdown/all.css using Plan A... Hunk #1 succeeded at 899 (offset 1 line). patch: **** malformed patch at line 518: div#log span.log-source-mini, Close -
try to apply the patch by hand.
-
Found the problem with the new patch.
Corrected a typo in the original patch and removed the leading space on this line in the pfsense-dropdown/all.css patchdiv#log span.log-source-mini,
Attached is a new patch.
-
thank you! that did it… applied and looking good so far
-
This patch doesnt seem to work, or is there something I am missing?
Patch seems to apply okay for Cino. So likely something specific to you.
What verion of pfSense are you trying to apply the patch too?
What is the command line you are running to apply the patch? -
Im running version Version 2.0.1
the command I am running to apply the patch is
patch -p0 -i Widget.Firewall_Logs_Widget_Filtering.patchAnd I receive the following output.
Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/widgets/widgets/log.widget.php 2011-09-13 13:02:36.000000000 -0700 |+++ /usr/local/www/widgets/widgets/log.widget.php.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:42:05.000000000 -0700 -------------------------- Patching file /usr/local/www/widgets/widgets/log.widget.php using Plan A... Hunk #1 failed at 41. Hunk #2 failed at 73. Hunk #3 failed at 112. Hunk #4 failed at 138. 4 out of 4 hunks failed--saving rejects to /usr/local/www/widgets/widgets/log.widget.php.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/javascript/filter_log.js 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/javascript/filter_log.js.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 19:10:10.000000000 -0700 -------------------------- Patching file /usr/local/www/javascript/filter_log.js using Plan A... Hunk #1 failed at 61. 1 out of 1 hunks failed--saving rejects to /usr/local/www/javascript/filter_log.js.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /etc/inc/filter_log.inc 2011-12-12 13:55:12.000000000 -0800 |+++ /etc/inc/filter_log.inc.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 19:09:38.000000000 -0700 -------------------------- Patching file /etc/inc/filter_log.inc using Plan A... Hunk #1 failed at 69. Hunk #2 failed at 87. Hunk #3 failed at 286. 3 out of 3 hunks failed--saving rejects to /etc/inc/filter_log.inc.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/_corporate/all.css 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/themes/_corporate/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:20:12.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/_corporate/all.css using Plan A... Hunk #1 failed at 935. Hunk #2 failed at 1096. Hunk #3 failed at 1132. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/_corporate/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/code-red/all.css 2011-09-13 13:02:33.000000000 -0700 |+++ /usr/local/www/themes/code-red/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:19:06.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/code-red/all.css using Plan A... Hunk #1 failed at 1018. Hunk #2 failed at 1180. Hunk #3 failed at 1216. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/code-red/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/metallic/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/metallic/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:17:43.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/metallic/all.css using Plan A... Hunk #1 failed at 986. Hunk #2 failed at 1149. Hunk #3 failed at 1185. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/metallic/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/nervecenter/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/nervecenter/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:16:12.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/nervecenter/all.css using Plan A... Hunk #1 failed at 1018. Hunk #2 failed at 1180. Hunk #3 failed at 1216. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/nervecenter/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/pfsense/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:08:02.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense/all.css using Plan A... Hunk #1 failed at 808. Hunk #2 failed at 844. 2 out of 2 hunks failed--saving rejects to /usr/local/www/themes/pfsense/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense_ng/all.css 2012-06-21 20:14:57.522797000 -0700 |+++ /usr/local/www/themes/pfsense_ng/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 20:51:49.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense_ng/all.css using Plan A... Hunk #1 failed at 1116. Hunk #2 failed at 1278. Hunk #3 failed at 1314. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/pfsense_ng/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/pfsense-dropdown/all.css 2011-09-13 13:02:34.000000000 -0700 |+++ /usr/local/www/themes/pfsense-dropdown/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:10:04.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/pfsense-dropdown/all.css using Plan A... Hunk #1 failed at 898. Hunk #2 failed at 934. 2 out of 2 hunks failed--saving rejects to /usr/local/www/themes/pfsense-dropdown/all.css.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/themes/the_wall/all.css 2011-09-13 13:02:35.000000000 -0700 |+++ /usr/local/www/themes/the_wall/all.css.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:12:20.000000000 -0700 -------------------------- Patching file /usr/local/www/themes/the_wall/all.css using Plan A... Hunk #1 failed at 1022. Hunk #2 failed at 1188. Hunk #3 failed at 1224. 3 out of 3 hunks failed--saving rejects to /usr/local/www/themes/the_wall/all.css.rej doneI havent customized anything outside of the GUI, though I did change my theme to the_wall, would that make a difference?
-
Im running version Version 2.0.1
the command I am running to apply the patch is
patch -p0 -i Widget.Firewall_Logs_Widget_Filtering.patchAnd I receive the following output.
Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /usr/local/www/widgets/widgets/log.widget.php 2011-09-13 13:02:36.000000000 -0700 |+++ /usr/local/www/widgets/widgets/log.widget.php.Firewall_Logs_Widget_Filtering.Patched 2012-06-21 21:42:05.000000000 -0700 -------------------------- Patching file /usr/local/www/widgets/widgets/log.widget.php using Plan A... Hunk #1 failed at 41. Hunk #2 failed at 73. Hunk #3 failed at 112. Hunk #4 failed at 138. 4 out of 4 hunks failed--saving rejects to /usr/local/www/widgets/widgets/log.widget.php.rejI havent customized anything outside of the GUI, though I did change my theme to the_wall, would that make a difference?
No changing the theme shouldn't make a difference. However logging in as root, so you have full permissions would.
Copyright 2025 Rubicon Communications LLC (Netgate). All rights reserved.