1
0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-18 17:27:20 +01:00

4349 Commits

Author SHA1 Message Date
Vadim Kurland
0d69945d2f see #2546 "PF import - negation inside of inline tables is
ignored". Since we can not import address lists or tables that contain
a mix of negated and non-negated items, importer should display an
error when it enounters one of these and mark all rules that use it as
"broken" (rule is colored red and error message is added to the
comment).
2011-07-07 18:04:24 -07:00
Vadim Kurland
56ee41fdee see #2556 "PF import: impor of rules referring to undefined
macros". If pf.conf file uses an undefined macro (there is $macro
somewhere but the macro has never been defined), importer issues a
warning, creates run-time DNSName object with the name "$macro" and
marks all rules where it is used as broken, that is, rules are colored
red and the error message is added to the comment field. Using
run-time DNSName object makes compiler use "$macro" in the generated
pf rule which means fwbuilder generates exactly the same pf rule as
the one it tried to import.
2011-07-07 17:24:57 -07:00
Vadim Kurland
d850139f2d see #2554 "PF import: create groups of address objects for macros
where possible". Importer for PF recognizes macros that define lists
of ip addresses, interfaces or host names and creates object groups
with the same name from them.  Only macros that contain at least one
ip address in the list are recognized.
2011-07-07 16:17:27 -07:00
Vadim Kurland
fff5775c39 new build 3558 2011-07-07 11:31:09 -07:00
Vadim Kurland
5544cd94d4 check if a macro used somewhere in the file to be imported is actually defined and abort if not 2011-07-07 11:16:48 -07:00
Vadim Kurland
c4000fc0a2 set the flag to make importer add standard comments to rules and objects in unit test 2011-07-07 11:16:16 -07:00
Vadim Kurland
6f842f1b99 see #2551 making sure rules that have route-to option get the call to setRoute() in the importer 2011-07-07 11:04:45 -07:00
Vadim Kurland
d98250b272 correct way to deal with object clipboard in unit tests; another patch from persgray@gmail.com 2011-07-06 18:42:14 -07:00
Vadim Kurland
758e96a7bb need to create clipboard object for unit tests 2011-07-06 18:34:14 -07:00
Vadim Kurland
bde7cd1043 clear option "prolog_place" in compiler for iosacl to make sure function CompilerDriver::assembleFwScriptInternal() does not get confused if user switched fw platform 2011-07-06 18:06:11 -07:00
Vadim Kurland
bc490dad17 another patch from persgray@gmail.com, making commandLinePrintingTest run on both Linux and BSD 2011-07-06 17:35:05 -07:00
Vadim Kurland
e0be917ef2 * applied two patches by Vadim Zhukov persgray@gmail.com to
replace calls to sprintf with safer calls to snprintf and fix some
compiler warnings.
2011-07-06 16:43:38 -07:00
Vadim Kurland
6046524a37 see #2552 "PF import: add ability to suppress comments referring to
line numbers in the original file".
2011-07-06 16:13:59 -07:00
Vadim Kurland
af95604f75 Merge branch 'development' of ssh://vc.netcitadel.com:2222/var/git/fwbuilder into development 2011-07-06 14:37:24 -07:00
Vadim Kurland
fd63078a5e see #2551 "PF Import - source routing rules are not imported with rule
options set". Importer should import "route-to" rule parameters.
2011-07-06 14:36:47 -07:00
Theron Tock
e241f452d3 Merge branch 'development' of ssh://ncgit/var/git/fwbuilder into development 2011-07-06 14:07:02 -07:00
Theron Tock
2bcad481d9 More files that use QFileDialog::getOpenFileName().
Fixes #2517.
2011-07-06 14:05:07 -07:00
Vadim Kurland
aea0e07d28 new build 3557 2011-07-06 14:00:54 -07:00
Vadim Kurland
2914c7f81a * PFImporter.cpp (newAddressTableObject): see #2546 "PF import -
negation inside of inline tables is ignored". We can not import
PF table definition that has some addresses negated.
2011-07-06 12:45:16 -07:00
Vadim Kurland
f45f9ccb4b * PFImporterRun.cpp (run): see #2550 "PF import - recursive macros
are not supported". Importer for PF should interpret macro
definitions that use other macros. See #2545 "PF import error when
using macro names with same base name and incrementing digit
suffix". Importer should correctly interpret a macro that has name
of another macro as a substring of its own name.
2011-07-06 12:14:06 -07:00
Vadim Kurland
0f7f4ed790 added right test files and re-ran tests for PF 2011-07-05 18:06:35 -07:00
Vadim Kurland
021cadf062 better behavior of FWObjectTypedChildIterator::operator--(); deleted test file that should have been recycled but wasnt 2011-07-05 18:00:48 -07:00
Vadim Kurland
531c5a83fe PolicyCompiler_pf_writers.cpp (processNext): see #2549 "Update
generated route-to configuration for PF versions 4.7 and later",
SF bug 3348931. The "route-to" parameter moved to the end of
pass rules in PF 4.7
2011-07-05 14:00:35 -07:00
Vadim Kurland
f6628dcb38 new build 3556 2011-07-05 13:31:36 -07:00
Vadim Kurland
eb67ae82ff * pf.g: fixed bug in PF import: address lists such as "{ addr1,
addr2, ... }" defined as macros or inside the rule could not be
imported correctly.

* pf.g: we should be able to import both "block quick log" and
"block log quick".
2011-07-05 13:27:14 -07:00
Vadim Kurland
93e1664516 fixed AddressRangeDialogTest 2011-07-01 13:29:47 -07:00
Vadim Kurland
7b38523f9f fixed CustomServiceDialogTest 2011-07-01 13:24:17 -07:00
Vadim Kurland
93883953b5 upgraded .fwb files in all unit tests; fixed GroupObjectDialogTest 2011-07-01 13:02:00 -07:00
Theron Tock
05e9a1e215 Made keyword add/remove buttons the same size.
Fixes #2547.
2011-06-30 11:35:40 -07:00
Vadim Kurland
54c16183e1 new build 3555 2011-06-29 18:46:57 -07:00
Theron Tock
d7ee7ebabb Adding new icons for dynamic groups.
Fixes #2544 partially.
2011-06-29 15:03:58 -07:00
Theron Tock
cad71437f3 Make sure user folders are added properly. Also deal with case of an
object that has a folder attribute that doesn't exist in the parent's
subfolders list (shouldn't ever happen, but in case it does it no longer
crashes).  Also make sure that subfolders don't have commas in them.

Fixes #2539.
2011-06-29 14:50:07 -07:00
Theron Tock
2ee4869fac Catch exception inside preprocessor loop so that loop continues after
error (for unit tests).  Also make sure to set ".loaded" variable before
calling loadFromSource so that if an exception happens we won't try to
load it again later.

Fixes #2542.
2011-06-29 14:28:33 -07:00
Theron Tock
57de77b341 On mac we can get a drop event even if dragMoveEvent() says the drop is
invalid.  So we validate the drop the same we validate in dragMove to
make sure we don't crash on an invalid drop.

Fixes #2540.
2011-06-29 12:58:55 -07:00
Theron Tock
6a80bb8018 Removed dependency on fwtransfer that no longer exists. 2011-06-29 11:09:45 -07:00
Vadim Kurland
1f420a97b0 new build 3554 2011-06-27 17:57:56 -07:00
Theron Tock
872fd64cb6 Various places in the code had logic for what directory to display in
QFileDialog.  There is now a single function to call,
FWBSettings::getOpenFileDir() that will compute what directory to start
in.

Cleaned out some code using QFileDialog that is never used (execDialog
and file button in CommentEditor).

Fixes #2517
2011-06-27 16:51:21 -07:00
Theron Tock
69364a4ee9 Display little folder icon next to "add subfolder". I don't see these
icons on linux so hopefully this comes out looking right.  :-)

Fixes #2528.
2011-06-27 14:48:03 -07:00
Theron Tock
a82219e002 Recent changes. 2011-06-27 14:34:14 -07:00
Theron Tock
64a8a7a9e2 Don't allow user to create duplicate subfolders. 2011-06-27 14:22:52 -07:00
Theron Tock
780ae6b0af Don't open editor for system folder after adding/deleting user folder.
Fixes #2530
2011-06-27 13:32:40 -07:00
Theron Tock
58f7142e4a Make it clear that cmp and shallowDuplicate are virtual.
Fixes #2535
2011-06-27 13:21:10 -07:00
Theron Tock
4621f42319 Fix crash I introduced with undo/redo of user folders.
Fixes #2529
2011-06-27 12:22:35 -07:00
Vadim Kurland
46a281a746 new build 3553 2011-06-23 19:59:52 -07:00
Theron Tock
cac508c0e5 Fix for #2522. 2011-06-23 17:02:51 -07:00
Theron Tock
240d4b5642 Merge branch 'development' of ssh://ncgit/var/git/fwbuilder into development 2011-06-23 16:41:50 -07:00
Theron Tock
8c19f9f873 Make user-defined folders deletable even when they have something inside
of them.  Also make all user-defined folder operations support
undo/redo.
2011-06-23 16:40:05 -07:00
Vadim Kurland
26b349482c build 3552 2011-06-22 16:19:02 -07:00
Vadim Kurland
404e15f24e fixes #2485 added tooltips for tagging and classification rule options 2011-06-22 15:57:26 -07:00
Vadim Kurland
5f93136e8f see #2518 renamed menu item 2011-06-22 15:41:34 -07:00