onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-18 17:27:20 +01:00
Code Issues Releases Wiki Activity

see #2153 added page with network zones explanation and widget; not functional yet but wizard navigates to it

Browse Source
This commit is contained in:
Vadim Kurland 2011-02-26 20:26:51 -08:00
parent ff53d6bd07
commit 849482d15d
8 changed files with 174 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
BUILD_NUM="3488"
BUILD_NUM="3489"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "4.2.0.3488"
#define VERSION "4.2.0.3489"
#define GENERATION "4.2"

2
packaging/fwbuilder-static-qt.spec
View File

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3488
%define version 4.2.0.3489
%define release 1
%if "%_vendor" == "MandrakeSoft"

2
packaging/fwbuilder.control
View File

@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra
Section: checkinstall
Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3488-1
Version: 4.2.0.3489-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

@ -1,6 +1,6 @@
%define name fwbuilder
%define version 4.2.0.3488
%define version 4.2.0.3489
%define release 1
%if "%_vendor" == "MandrakeSoft"

75
src/libgui/DiscoveryDruid.cpp
View File

@ -442,7 +442,7 @@ void DiscoveryDruid::changedSelected( const int &page )
case 1: // Reading file in hosts format
{
setNextEnabled(page,false);
setNextEnabled(page, false);
changedHostsFileName();
m_dialog->filename->setFocus();
break;
@ -451,8 +451,8 @@ void DiscoveryDruid::changedSelected( const int &page )
case 2: // import config
{
m_dialog->obj_name->setFocus();
setBackEnabled(page,true);
setFinishEnabled(page,false);
setBackEnabled(page, true);
setFinishEnabled(page, false);
break;
}
@ -563,7 +563,18 @@ void DiscoveryDruid::changedSelected( const int &page )
setBackEnabled(page,false);
cancelButton->hide();
createRealObjects();
setFinishEnabled(page,true);
setNextEnabled(page, false);
setFinishEnabled(page, true);
finishButton->setFocus();
break;
}
case 14: // Network zones for PIX
{
setBackEnabled(page, false);
cancelButton->hide();
setNextEnabled(page, false);
setFinishEnabled(page, true);
finishButton->setFocus();
break;
}
@ -571,7 +582,7 @@ void DiscoveryDruid::changedSelected( const int &page )
default : {}
}
FromPage=page;
FromPage = page;
}
void DiscoveryDruid::startBackgroundProcess()
@ -669,9 +680,9 @@ void DiscoveryDruid::getNameServers()
void DiscoveryDruid::setDiscoveryMethod_file()
{
current_task=BT_HOSTS;
m_dialog->processname->setText(tr("Hosts file parsing ..."));
for (int i=0;i<WIZARD_PAGES;i++)
current_task = BT_HOSTS;
for (int i=0; i<WIZARD_PAGES; i++)
{
setAppropriate( i, WIZARD_FILE_PAGES[i]);
}
@ -680,8 +691,8 @@ void DiscoveryDruid::setDiscoveryMethod_file()
void DiscoveryDruid::setDiscoveryMethod_DNS()
{
m_dialog->processname->setText(tr("DNS zone transfer ..."));
current_task=BT_DNS;
for (int i=0;i<WIZARD_PAGES;i++)
current_task = BT_DNS;
for (int i=0; i<WIZARD_PAGES; i++)
{
setAppropriate( i, WIZARD_DNS_PAGES[i]);
}
@ -690,8 +701,8 @@ void DiscoveryDruid::setDiscoveryMethod_DNS()
void DiscoveryDruid::setDiscoveryMethod_SNMP()
{
m_dialog->processname->setText(tr("Network discovery using SNMP ..."));
current_task=BT_SNMP;
for (int i=0;i<WIZARD_PAGES;i++)
current_task = BT_SNMP;
for (int i=0; i<WIZARD_PAGES; i++)
{
setAppropriate( i, WIZARD_SNMP_PAGES[i]);
}
@ -700,8 +711,8 @@ void DiscoveryDruid::setDiscoveryMethod_SNMP()
void DiscoveryDruid::setDiscoveryMethod_Import()
{
m_dialog->processname->setText(tr("Import configuration from file ..."));
current_task=BT_IMPORT;
for (int i=0;i<WIZARD_PAGES;i++)
current_task = BT_IMPORT;
for (int i=0; i<WIZARD_PAGES; i++)
{
setAppropriate( i, WIZARD_IMPORT_PAGES[i]);
}
@ -782,13 +793,7 @@ void DiscoveryDruid::startConfigImport()
// need to pick right platform string based on
// m_dialog->import_platform->currentItem()
string platform = "";
switch (m_dialog->import_platform->currentIndex())
{
case IMPORT_IOS: platform = "iosacl"; break;
case IMPORT_IPT: platform = "iptables"; break;
case IMPORT_PIX: platform = "pix"; break;
}
string platform = selectedPlatform();
//
// ConfigImport "owns" buffer - it is deleted
@ -808,6 +813,18 @@ void DiscoveryDruid::startConfigImport()
}
}
string DiscoveryDruid::selectedPlatform()
{
string platform = "";
switch (m_dialog->import_platform->currentIndex())
{
case IMPORT_IOS: platform = "iosacl"; break;
case IMPORT_IPT: platform = "iptables"; break;
case IMPORT_PIX: platform = "pix"; break;
}
return platform;
}
InetAddr DiscoveryDruid::getNS()
{
string ns;
@ -1657,9 +1674,11 @@ void DiscoveryDruid::customEvent(QEvent *event)
case BT_HOSTS:
loadDataFromFile();
break;
case BT_IMPORT:
loadDataFromImporter();
break;
default:
break;
}
@ -1685,10 +1704,22 @@ void DiscoveryDruid::customEvent(QEvent *event)
nextButton->setEnabled(false);
}
break;
case BT_IMPORT:
setFinishEnabled(currentPage(),true);
finishButton->setFocus();
{
// if imported PIX, need to show one more page to select network zones
if (selectedPlatform() == "pix")
{
setNextEnabled(currentPage(), true);
setFinishEnabled(currentPage(), false);
} else
{
setNextEnabled(currentPage(), false);
setFinishEnabled(currentPage(), true);
finishButton->setFocus();
}
break;
}
default:
break;
}

13
src/libgui/DiscoveryDruid.h
View File

@ -238,6 +238,8 @@ private:
libfwbuilder::InterfaceData *in,
bool skip_ip_address_check);
void addToLog(const QString &buf);
std::string selectedPlatform();
public:
@ -320,11 +322,12 @@ public slots:
};
const int WIZARD_PAGES=13;
const bool WIZARD_FILE_PAGES[] = {1,1,0,0,0,0,0,0,1,0,1,0,1,1};
const bool WIZARD_DNS_PAGES[] = {1,0,0,1,1,0,0,0,1,0,1,0,1,1};
const bool WIZARD_SNMP_PAGES[] = {1,0,0,0,0,1,1,1,1,1,1,1,1,1};
const bool WIZARD_IMPORT_PAGES[] = {1,0,1,0,0,0,0,0,1,0,0,0,0,0};
const int WIZARD_PAGES = 15;
const bool WIZARD_FILE_PAGES[] = {1,1,0,0,0,0,0,0,1,0,1,0,1,1,0};
const bool WIZARD_DNS_PAGES[] = {1,0,0,1,1,0,0,0,1,0,1,0,1,1,0};
const bool WIZARD_SNMP_PAGES[] = {1,0,0,0,0,1,1,1,1,1,1,1,1,1,0};
const bool WIZARD_IMPORT_PAGES[] = {1,0,1,0,0,0,0,0,1,0,0,0,0,0,1};

123
src/libgui/discoverydruid_q.ui
View File

@ -9,7 +9,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>589</width>
<width>660</width>
<height>670</height>
</rect>
</property>
@ -48,7 +48,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>2</number>
<number>13</number>
</property>
<widget class="QWidget" name="WizardPage0">
<layout class="QGridLayout">
@ -257,7 +257,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="page">
<widget class="QWidget" name="WizardPage2">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@ -439,7 +439,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage2">
<widget class="QWidget" name="WizardPage3">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -559,7 +559,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage3">
<widget class="QWidget" name="WizardPage4">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -766,7 +766,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage4">
<widget class="QWidget" name="WizardPage5">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -992,7 +992,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage5">
<widget class="QWidget" name="WizardPage6">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -1121,7 +1121,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage6">
<widget class="QWidget" name="WizardPage7">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -1375,7 +1375,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage7">
<widget class="QWidget" name="WizardPage8">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -1479,7 +1479,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage8">
<widget class="QWidget" name="WizardPage9">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -1627,7 +1627,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage9">
<widget class="QWidget" name="WizardPage10">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -1775,7 +1775,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage10">
<widget class="QWidget" name="WizardPage11">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@ -1917,7 +1917,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage11">
<widget class="QWidget" name="WizardPage12">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -1978,7 +1978,7 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage12">
<widget class="QWidget" name="WizardPage13">
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
@ -2021,6 +2021,97 @@ Please enter the domain name below:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="WizardPage14">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label666_2">
<property name="text">
<string>Firewall Builder uses Network Zones to determine network topology. Each firewall interface must have a Network Zone configured. The Network Zone of an interface represents the set of IP networks that would be the source IP address of traffic arriving inbound on an interface.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>If you do not set the Network Zone now you can update the Network Zone configuration after the firewall has been created by double-clicking on the network interface of the firewall object and then selecting the desired object from the Network Zone dropdown list.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="MainRes.qrc">:/Images/network_zone_dialog.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QFrame" name="frame160_2">
<property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QTableWidget" name="iface_nz_list">
<property name="showGrid">
<bool>true</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<column>
<property name="text">
<string>Name</string>
</property>
</column>
<column>
<property name="text">
<string>Label</string>
</property>
</column>
<column>
<property name="text">
<string>Address</string>
</property>
</column>
<column>
<property name="text">
<string>Security Level</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
@ -2155,7 +2246,9 @@ Please enter the domain name below:</string>
<tabstop>typeChangingList</tabstop>
<tabstop>libs</tabstop>
</tabstops>
<resources/>
<resources>
<include location="MainRes.qrc"/>
</resources>
<connections>
<connection>
<sender>addLastFilterButton</sender>