Changeset 5892

Timestamp:

03/28/11 15:09:22 (2 years ago)

Author:

luis

Message:

Merged revisions 5842,5851-5852,5859,5870-5871,5873-5879,5883,5885-5890 via svnmerge from
http://svn.umitproject.org/svnroot/umit/network-scanner/trunk

........

r5842 | getxsick | 2010-08-20 10:06:59 +0100 (Fri, 20 Aug 2010) | 2 lines

fix #370 : this is for ctrl+c issue

........

r5851 | luis | 2010-08-23 10:29:44 +0100 (Mon, 23 Aug 2010) | 1 line

Fixing duplicate word (english)

........

r5852 | luis | 2010-08-23 12:51:24 +0100 (Mon, 23 Aug 2010) | 1 line

Changing version of documentation

........

r5859 | diogo | 2010-08-24 16:14:38 +0100 (Tue, 24 Aug 2010) | 1 line

patch of ticket 392 applied

........

r5870 | luis | 2010-09-05 19:24:03 +0100 (Sun, 05 Sep 2010) | 2 lines

(Network Scanner)
Added wizard documentation

........

r5871 | luis | 2010-09-05 20:14:54 +0100 (Sun, 05 Sep 2010) | 3 lines

(Network Scanner)

• s/Umit/Umit Network Scanner
• Ajust columns (max 80 chars per line)

........

r5873 | luis | 2011-02-16 21:46:35 +0000 (Wed, 16 Feb 2011) | 1 line

Fixing #292 - name of comenents at trac are deprecated

........

r5874 | luis | 2011-03-10 11:19:15 +0000 (Thu, 10 Mar 2011) | 1 line

Fixing #413 - parsing invalid xml

........

r5875 | luis | 2011-03-10 11:27:38 +0000 (Thu, 10 Mar 2011) | 1 line

Fixing #394 - Path issue

........

r5876 | luis | 2011-03-10 11:35:52 +0000 (Thu, 10 Mar 2011) | 1 line

Fixing #380: conflits with umitweb in Windows

........

r5877 | luis | 2011-03-10 13:59:46 +0000 (Thu, 10 Mar 2011) | 1 line

Fixing #381 - in merger module: .umit already exists (Windows)

........

r5878 | luis | 2011-03-10 14:50:30 +0000 (Thu, 10 Mar 2011) | 1 line

Fixing #418

........

r5879 | luis | 2011-03-10 23:17:11 +0000 (Thu, 10 Mar 2011) | 1 line

Complete fixing #381: assigned variable bug

........

r5883 | luis | 2011-03-11 00:50:22 +0000 (Fri, 11 Mar 2011) | 1 line

(network scanner) changing version from windows installers

........

r5885 | luis | 2011-03-12 15:23:51 +0000 (Sat, 12 Mar 2011) | 1 line

Fixing bug related with icons: OS icons was not appearing. Now fixed, thanks to Rodolfo Carvalho

........

r5886 | luis | 2011-03-26 15:36:12 +0000 (Sat, 26 Mar 2011) | 1 line

(Network Scanner) - fixing error in umit.exe pack, now it includes also gio. further info checkout PyGTK and Py2Exe FAQ at py2exe website

........

r5887 | luis | 2011-03-26 15:47:16 +0000 (Sat, 26 Mar 2011) | 1 line

(Network Scanner) Revert conf to previous version. it was touched by mistake

........

r5888 | luis | 2011-03-26 16:21:26 +0000 (Sat, 26 Mar 2011) | 1 line

(Network Scanner) Fixing issue on py2exe - import error of email.message

........

r5889 | luis | 2011-03-26 18:07:05 +0000 (Sat, 26 Mar 2011) | 1 line

(Network Scanner) fixing deps on ubuntu/debian package

........

r5890 | luis | 2011-03-26 22:05:01 +0000 (Sat, 26 Mar 2011) | 1 line

(Network Scanner) Adding documentation to the bundle

........

Location:

network-scanner/branches/GSoC2010

Files:

• . (modified) (1 prop)
• bin/umit (modified) (1 diff)
• install_scripts/linux/ubuntu/debian/control (modified) (1 diff)
• install_scripts/windows/generate_windows_installer.bat (modified) (2 diffs)
• install_scripts/windows/py2exe_setup.py (modified) (1 diff)
• install_scripts/windows/umit_compiled.nsi (modified) (1 diff)
• share/doc/umit/src/comparing_results.rst (modified) (10 diffs)
• share/doc/umit/src/conf.py (modified) (1 diff)
• share/doc/umit/src/interface_editor.rst (modified) (7 diffs)
• share/doc/umit/src/network_topology.rst (modified) (1 diff)
• share/doc/umit/src/plugins.rst (modified) (3 diffs)
• share/doc/umit/src/plugins_dev.rst (modified) (1 diff)
• share/doc/umit/src/profile_editor.rst (modified) (4 diffs)
• share/doc/umit/src/scanning.rst (modified) (6 diffs)
• share/doc/umit/src/under_the_roof.rst (modified) (3 diffs)
• share/doc/umit/src/wizard.rst (modified) (2 diffs)
• share/umit/config/umit.conf (modified) (8 diffs)
• umit/core/NmapParser.py (modified) (3 diffs)
• umit/core/UmitDB.py (modified) (1 diff)
• umit/gui/About.py (modified) (1 diff)
• umit/gui/App.py (modified) (3 diffs)
• umit/gui/BugReport.py (modified) (1 diff)
• umit/gui/ScanNotebook.py (modified) (3 diffs)
• umit/gui/Wizard.py (modified) (2 diffs)
• umit/merger/nt_appdata.py (modified) (1 diff)

network-scanner/branches/GSoC2010/bin/umit

@@ -218 +218 @@
 
 def main(args):
-    # Setting the umit home directory
-    from umit.core.Paths import Path
-    Path.set_umit_conf(os.path.dirname(args[0]))
-    #################################
-    Path.set_running_path(os.path.abspath(os.path.dirname(args[0])))
-
-    # Check permissions
-    from umit.gui.Utils import verify_config_access
-    verify_config_access()
-    
-    from umit.gui.App import App
-
-    umit_app = App()
+    try:
+        # Setting the umit home directory
+        from umit.core.Paths import Path
+        Path.set_umit_conf(os.path.dirname(args[0]))
+        #################################
+        Path.set_running_path(os.path.abspath(os.path.dirname(args[0])))
+        from umit.core.BasePaths import base_paths
+        if not os.path.exists(base_paths['pixmaps_dir']):
+            from higwidgets.higdialogs import HIGAlertDialog
+            alert = HIGAlertDialog(message_format=_('Missing share directory'),
+                                       secondary_text=_('Don\'t have read share\
+directory. Please reinstall the application.'))
+            alert.run()
+            alert.destroy()
+            sys.exit(1)
+        
+
+        # Check permissions
+        from umit.gui.Utils import verify_config_access
+        verify_config_access()
+        
+        from umit.gui.App import App
+
+        umit_app = App()
+    except KeyboardInterrupt:
+        # there is no need to run safe_shutdown()
+        # cause we haven't created App instance yet
+        sys.exit(signal.SIGINT)
 
     if os.name == "posix":

network-scanner/branches/GSoC2010/install_scripts/linux/ubuntu/debian/control

@@ -12 +12 @@
 Package: umit
 Architecture: all
-Depends: ${python:Depends}, python-gnome2-extras, nmap (>= 4.50), python-gtk2, python-pysqlite2, python-gobject
+Depends: ${python:Depends}, nmap (>= 4.50), python-gtk2, python-gobject
 XB-Python-Version: ${python:Versions}
 Recommends: python-psyco

network-scanner/branches/GSoC2010/install_scripts/windows/generate_windows_installer.bat

@@ -7 +7 @@
 
 echo Setting installation variables...
-set PythonEXE=C:\Python26\python.exe
+set PythonEXE=C:\Python27\python.exe
 set UmitOrig=.
 set UmitDir=C:\UmitTemp
 set DistDir=%UmitDir%\dist
 set GTKDir=C:\GTK
-set NmapDir=C:\Programas\Nmap
-set WinpcapDir=C:\programas\Winpcap
+set NmapDir="C:\Program Files (x86)\Nmap"
+set WinpcapDir="C:\Program Files (x86)\Winpcap"
 set WinInstallDir=%UmitDir%\install_scripts\windows
 set Output=%UmitDir%\win_install.log
-set MakeNSIS=C:\programas\NSIS\makensis.exe
+set MakeNSIS="C:\Program Files (x86)\NSIS\makensis.exe"
 set UtilsDir=%UmitDir%\install_scripts\utils
 
@@ -73 +73 @@
 %PythonEXE% -OO setup.py py2exe
 
+echo Copying the html docs
+xcopy share\doc\umit\html\*.* %DistDir%\share\doc\umit\html\ /S /I >> %Output%
 
 echo Copying some more GTK files to dist directory...

network-scanner/branches/GSoC2010/install_scripts/windows/py2exe_setup.py

@@ -76 +76 @@
             "compressed": 1,
             "optimize": 2,
-            "packages": "encodings",
+            "packages": ["encodings", "email"],
             "includes": [
-                'pango', 'atk', 'gobject', 'pickle', 'bz2',
+                'pango', 'atk', 'gobject', 'pickle', 'bz2', 'gio',
                 'encodings', 'encodings.*', 'cairo', 'pangocairo'],
             # Ignore psyco if it is not installed

network-scanner/branches/GSoC2010/install_scripts/windows/umit_compiled.nsi

@@ -463 +463 @@
 
 !define APPLICATION_NAME "Umit"
-!define APPLICATION_VERSION "1.0RC"
+!define APPLICATION_VERSION "1.0"
 !define WINPCAP "WinPcap_4_0_2.exe"
 

network-scanner/branches/GSoC2010/share/doc/umit/src/comparing_results.rst

@@ -21 +21 @@
 ---------------------
 
-To reach the Compare Results Window, make sure that Umit is open, and then
-do one of  the following:
+To reach the Compare Results Window, make sure that Umit Network Scanner is open, 
+and then do one of  the following:
 
    1. **Use the key-stroke**
@@ -28 +28 @@
       * The key-stroke that shows the Compare Results Window is CTRL + D.
 
-   2. **Single click on the Compare Results Icon in the Main Toolbar**
-
-      * The Compare Results Icon in the Main Toolbar may differ from theme
-        to theme, but it is always the 6th icon counting from left to right.
-
-   3. **Access from the Main Menu**
+   2. **Access from the Main Menu**
 
       * Go to the *Main Menu* (the one on the top of the application),
-        File->Compare Results.
+        Tools->Compare Results.
 
 
@@ -42 +37 @@
 ----------------------
 
-To avoid too much user interaction, and usability problems, Umit
+To avoid too much user interaction, and usability problems, Umit Network Scanner
 automatically make available at the *Compare Results Window* combo boxes,
 the scan results currently loaded in the main interface. As you may have
@@ -52 +47 @@
 
 If one or both of the scan results that you wish to compare are not loaded in
-Umit's main interface, you can compare then by loading then inside the
-*Compare Results Window* without the need of closing the window, loading the
-results into scan tabs, and then openning the *Compare Results Window* again.
-To load then directly, use the Open button that resides on the right of each
-combo box.
+Umit Network Scanner's main interface, you can compare then by loading then 
+inside the *Compare Results Window* without the need of closing the window, 
+loading the results into scan tabs, and then openning the 
+*Compare Results Window* again. To load then directly, use the Open button 
+that resides on the right of each combo box.
 
 You may also want to compare results that are not saved into files, but inside
-the Umit's search data base. To load those results, you'll have to load then
-into scan tabs first, and then open the *Compare Results Window* to compare
-them. It's a bit cumbersome, but loading then directly from the
+the Umit Network Scanner's search data base. To load those results, you'll 
+have to load then into scan tabs first, and then open the *Compare Results Window* 
+to compare them. It's a bit cumbersome, but loading then directly from the
 *Compare Results Window* would implicate on creating more widgets inside
 the window and making it more complex, thus lowing it's usability anyway.
@@ -84 +79 @@
 usefull comparison.
 
-Let's say that you have two different scans loaded in Umit, and you wish
-to compare then. The first one, called *"Quick Scan on 192.168.204.128"* is
-a scan result made 2 days ago, and the second one, called
+Let's say that you have two different scans loaded in Umit Network Scanner, and 
+you wish to compare then. The first one, called *"Quick Scan on 192.168.204.128"* 
+is a scan result made 2 days ago, and the second one, called
 *"Regular Scan on 192.168.204.128"* is a just finished scan result. The goal
 is to verify if something has changed during this 2 days, like if a service
@@ -104 +99 @@
 and at *Scan Result 2* select *"Regular Scan on 192.168.204.128"*.
 In the moment you finish the selection of the results you want to compare,
-Umit detects your choices and generates automatically the comparison result.
+Umit Network Scanner detects your choices and generates automatically 
+the comparison result.
 
    .. image:: static/comparing_results2.png
@@ -110 +106 @@
 
 The *Compare Results Window* with selected results and the comparison
-generated automatically by Umit.
+generated automatically by Umit Network Scanner.
 
    .. image:: static/comparing_results3.png
@@ -121 +117 @@
 ------------------
 
-If you're an old Umit user, you won't be surprised with the text mode.
-But maybe, if you are a new user, you will probably be questionning why
+If you're an old Umit Network Scanner user, you won't be surprised with the text 
+mode. But maybe, if you are a new user, you will probably be questionning why
 there is a *"Text mode"*, if you've got the *"Compare mode"*, that is easier
 to read and understand. Here goes the answer: The *"Text mode"* is the first
@@ -131 +127 @@
 copied and pasted anywhere. This mode is not so complete as the
 *"Compare mode"*, but it's the only one that you can save for latter analysis.
-In the future, Umit will feature a report generation tool, to ease this task.
+In the future, Umit Network Scanner will feature a report generation tool, 
+to ease this task.
 
 
@@ -251 +248 @@
 ^^^^^^^^^^^^
 
-There's a bug that avoids the use of this feature when Umit is been executed
-with *sudo* in Linux.
+There's a bug that avoids the use of this feature when Umit Network Scanner is 
+been executed with *sudo* in Linux.

network-scanner/branches/GSoC2010/share/doc/umit/src/conf.py

@@ -48 +48 @@
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0RC'
+release = '1.0'
 
 # There are two options for replacing |today|: either, you set today to some

network-scanner/branches/GSoC2010/share/doc/umit/src/interface_editor.rst

@@ -8 +8 @@
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 
@@ -18 +18 @@
 should be able to add, edit and remove **Nmap** options.
 
-Profile Editor and Wizard are using XML files to load his options. Interface Editor
-management this XMLs and show a graphical interface to handle it in run-time.
+Profile Editor and Wizard are using XML files to load his options. Interface 
+Editor management this XMLs and show a graphical interface to handle it 
+in run-time.
 
 What does it do?
@@ -91 +92 @@
 * Need Root 
    
-   If "Need Root" is able this option will be not considered if Umit is running without 
-   Administrator level.
+   If "Need Root" is able this option will be not considered if Umit Network
+   Scanner is running without Administrator level.
 
 * Options + Args 
@@ -112 +113 @@
    The description of input parameters of Nmap introduced in "Args" button
 
-If you add a new option or delete it will be added to Undo/Redo stack and you can easier rollback changes.
+If you add a new option or delete it will be added to Undo/Redo stack and you 
+can easier rollback changes.
    
    
@@ -119 +121 @@
 
 
-If a user can remove an option it can be done, just selecting the option in the list
-and then press in "Delete" button.
+If a user can remove an option it can be done, just selecting the option in the 
+list and then press in "Delete" button.
 
 
@@ -129 +131 @@
    Interface Editor - Remove Option with Dependence
 
-In :ref:`Remove Option <ieditorremoveoption>` there is dependence in Profile and Wizard.
-If you remove the option it will removed also from Profile Editor and Wizard.
+In :ref:`Remove Option <ieditorremoveoption>` there is dependence in Profile and
+Wizard. If you remove the option it will removed also from Profile Editor and Wizard.
 
 
@@ -158 +160 @@
 
 
-If you remove an option (just selecting, and press "Delele" or throught the tooolbar/menu)
-automatically you get a voidplace. Then user will be able to exchange the option.
-
-In each option user can put the option up or down from the others just using menu "Items"
-or using the left toolbar.
+If you remove an option (just selecting, and press "Delele" or throught the 
+tooolbar/menu) automatically you get a voidplace. Then user will be able to
+exchange the option.
+
+In each option user can put the option up or down from the others just using 
+menu "Items" or using the left toolbar.
 
 *Sections*

network-scanner/branches/GSoC2010/share/doc/umit/src/network_topology.rst

@@ -10 +10 @@
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 

network-scanner/branches/GSoC2010/share/doc/umit/src/plugins.rst

@@ -7 +7 @@
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 Introduction
@@ -14 +14 @@
 
 Plugins are useful to implement indipendent features that could help the user
-to customize the UMIT experience.
+to customize the Umit Network Scanner experience.
 
-From the Plugin Window you could manage UMIT plugins. The window is divided in
-two sections the *Extensions* and *Path* view.
+From the Plugin Window you could manage Umit Network Scanner plugins. 
+The window is divided in two sections the *Extensions* and *Path* view.
 
 Extensions View
@@ -117 +117 @@
 Plugin Path directory, listed in the *Paths* View.
 
-For example on *NIX system you could do::
+For example on *NIX* system you could do::
 
    $ cd ~/.umit/plugins

network-scanner/branches/GSoC2010/share/doc/umit/src/plugins_dev.rst

@@ -7 +7 @@
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 Introduction

network-scanner/branches/GSoC2010/share/doc/umit/src/profile_editor.rst

@@ -8 +8 @@
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 
@@ -22 +22 @@
 future. 
 
-Since Umit Network Scanner 1.0 it was included a manager of Profiles called ProfileManager.
+Since Umit Network Scanner 1.0 it was included a manager of Profiles called 
+ProfileManager.
 
 What does it do?
@@ -58 +59 @@
 
    * Go to the *Main Menu* (the one on the top of the application)
-   :menuselection:`Profile --> New Profile`
+   
+    :menuselection:`Profile --> New Profile`
 
 3. **Access from the ProfileManager**
@@ -165 +167 @@
 -----------------------------
 
-The *Profile Manager* is able to create, edit and delete new profiles as we explain above.
+The *Profile Manager* is able to create, edit and delete new profiles as we 
+explain above.
 
    .. image:: static/profile_manager.png

network-scanner/branches/GSoC2010/share/doc/umit/src/scanning.rst

@@ -7 +7 @@
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 
@@ -14 +14 @@
 ------------
 
-Umit was designed to accomodate and run more than one scan at time. Each scan
-is executed and shown inside a *Scan Tab*, which has a title and organize
-every information obtained in the scan result.
+Umit Network Scanner was designed to accomodate and run more than one scan at 
+time. Each scan is executed and shown inside a *Scan Tab*, which has a title 
+and organize every information obtained in the scan result.
 
 The *Scan Tab* tries to facilitate your life, by making the unformations
@@ -31 +31 @@
 a boring task that gets worst when you have to do that more than once.
 
-An answer to your problem is Umit, that can handle this task easily, with
-just a couple of clicks.
+An answer to your problem is Umit Network Scanner, that can handle this task 
+easily, with just a couple of clicks.
 
 So, if you're wondering if you should retire the command line, I would say
@@ -45 +45 @@
 pull off your doubt about what is up or down from were you stand.
 
-Umit is intended to help you manage your network, by giving you a better
-way to examine carefully your network peers. If your intention is to
-*know* better your network, then Umit is what you need.
+Umit Network Scanner is intended to help you manage your network, by giving you
+a better way to examine carefully your network peers. If your intention is to
+*know* better your network, then Umit Network Scanner is what you need.
 
 
@@ -54 +54 @@
 
 To start a scan, you need an empty *Scan Tab*. At the time you start
-Umit, a new *Scan Tab* is made available, and as soon as the main interface
-is shown, you can start typing the target address. If you already used this
-*Scan Tab*, you can create a new one, by doing one of the following:
+Umit Network Scanner, a new *Scan Tab* is made available, and as soon as the 
+main interface is shown, you can start typing the target address. If you already
+used this *Scan Tab*, you can create a new one, by doing one of the following:
 
    1. **Use the key-stroke**
@@ -77 +77 @@
 ----------------
 
-By the moment you start Umit, or create a new scan tab, you can start typing
-the address of the target(s) that you want to scan. Every target inserted into
-the Target field is recorded and remembered in case you need it in the future.
-As this field features an auto-completation, it's going to be easy the reuse of
-targets.
+By the moment you start Umit Network Scanner, or create a new scan tab, you can 
+start typing the address of the target(s) that you want to scan. Every target 
+inserted into the Target field is recorded and remembered in case you need it in
+the future. As this field features an auto-completation, it's going to be easy 
+the reuse of targets.
 
 

network-scanner/branches/GSoC2010/share/doc/umit/src/under_the_roof.rst

@@ -8 +8 @@
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 
@@ -17 +17 @@
 -------------------
 
-Umit will always try to create a $HOME/.umit configuration directory if it
-doesn't exists yet, under UNIX. Under Windows it will try to a configuration
-directory named umit under user's local application data. We call this
-configuration directory as UMIT_CFG_DIR.
+Umit Network Scanner will always try to create a $HOME/.umit configuration 
+directory if it doesn't exists yet, under UNIX. Under Windows it will try to a 
+configuration directory named umit under user's local application data. 
+We call this configuration directory as UMIT_CFG_DIR.
 
-The steps bellow, describes how Umit is going to behave on every
+The steps bellow, describes how Umit Network Scanner is going to behave on every
 startup in order to load the configuration files:
 
@@ -51 +51 @@
 -----------
 
-Yes, there are easter eggs in Umit. Go find them!
+Yes, there are easter eggs in Umit Network Scanner. Go find them!

network-scanner/branches/GSoC2010/share/doc/umit/src/wizard.rst

@@ -2 +2 @@
 ==========================
 
+.. sectionauthor:: Luís A. Bastião Silva
 .. sectionauthor:: Adriano Monteiro Marques
+
 
 .. warning::
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 
@@ -14 +16 @@
 ------------
 
-# What is the command constructor wizard?
+Using Umit Network Scanner user is able to choose options, arguments or make 
+repeated scans. Sometimes it is not a easier process. Even with Profile Editor 
+it is not a easier task. Command Constructor Wizard was create to help users 
+create a customized command.
 
-# What do it does?
+Using wizard available options can be enable quickly and a new profile will be
+create faster.
 
-# The customization advantage
-
-
-The profile editor modes
+The wizard modes
 ------------------------
 
-# New profile
+Wizard has two modes: Novice and Expert. If Expert mode is selected it will open 
+Profile Editor. Otherwise it will give an assistance helping you creating a 
+customized profile.
 
-# Edit profile
-
-
-Creating a simple scan profile
-------------------------------
-
-# The profile descriptions (name, hint, description, etc.)
-
-# The default options
-
-# Saving the profile
-
-# How to use the recently created profile?
-
-
-Editing a profile
------------------
-
-# The profile editor's edit mode
-
-
-Creating a new profile based on an old one
-------------------------------------------
-
-# The profile editor's create new from profile mode
-
-
-The profile editor structure
-----------------------------
-
-# The profile_editor.xml and the options.xml
-
-# The xml sintax
-
-# The widgets available for options
-
-# Positioning rules
-
-
-Adding new options to profile editor
-------------------------------------
-
-# Adding the option to options.xml
-
-# Calling the option in profile_editor.xml
-
-# Watching the show
-
-
-Removing an undesired option
-----------------------------
-
-# Removing from profile_editor.xml
-
-# Removing from options.xml (If you really don't want it anymore)
-
-# Verifying if the options is not called at wizard.xml, else, the lack of an
-option called inside the wizard.xml will break it.
-
-
-Sharing options, and profile editors
-------------------------------------
-
-# Which files do you have to share?
-
-# Where to save?
-
-# How to share?
-

network-scanner/branches/GSoC2010/share/umit/config/umit.conf

@@ -6 +6 @@
 highlight = [65535, 65535, 65535]
 underline = 0
+
+[database]
+umit_decay = 60
+inventory_decay = 0
 
 [date_highlight]
@@ -33 +37 @@
 modified = [63881, 42182, 13193]
 
+[expose]
+host_list = 1
+show_toolbar = 1
+icons_toolbar_size = larger
+icons_toolbar = Both
+page_inside = 1
+details = 1
+
 [filtered_port_highlight]
 regex = \d{1,5}/.{1,5}\s+filtered\s+.*
@@ -41 +53 @@
 underline = 0
 
+[general_settings]
+log = File
+warnings = 1
+silent_root = 0
+splash = 1
+log_file = umit.log
+warnings_save = 1
+crash_report = 1
+
 [hostname_highlight]
-regex =  (\w{2,}://)?(([a-zA-Z0-9]|-)+\.)+([a-zA-Z]{2,}|com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|museum)([\w\d#/])*
+regex = (\w{2,}://)?(([a-zA-Z0-9]|-)+\.)+([a-zA-Z]{2,}|com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|museum)([\w\d#/])*
 bold = 1
 text = [0, 111, 65535]
@@ -48 +69 @@
 highlight = [65535, 65535, 65535]
 underline = 1
+
+[inventory]
+tips = True
+tabs_close_btn = True
 
 [ip_highlight]
@@ -56 +81 @@
 highlight = [65535, 65535, 65535]
 underline = 0
+
+[mapper]
+layout = 1
+zoom = 1.0
+lower_ring = 10
+frames = 60
+ring = 30
+view = address;hostname;icon;ring;region;slow
+interpolation = 1
+
+[network]
+username = 
+hostname = 
+proxy = 0
+password = 
+port = 
 
 [open_port_highlight]
@@ -71 +112 @@
 nmap_command_path = nmap
 
+[plugins]
+paths = /Volumes/Extend/Umit/svn/network-scanner/branches/GSoC2010/share/umit/config/plugins
+plugins = 
+
 [port_list_highlight]
 regex = PORT\s+STATE\s+SERVICE(\s+VERSION)?\s.*
@@ -79 +124 @@
 underline = 0
 
-[search]
-search_db = 1
-file_extension = usr
-store_results = 1
-directory = 
-save_time = 60;days
-
-[general_settings]
-splash = 1 
-warnings = 1
-crash_report = 1
-log = File
-log_file = umit.log
-warnings_save = 1
-silent_root = 0
-
-[expose]
-icons_toolbar = Both
-icons_toolbar_size = larger
-show_toolbar = 1
-host_list = 1
-details = 1
-page_inside = 1
-
 [profiles]
 profile = profile_editor.xml
@@ -109 +130 @@
 scan_profile = scan_profile.usp
 
-[network]
-proxy = 0
-hostname = 
-port = 
-username = 
-password = 
-
-[database]
-umit_decay = 60
-inventory_decay = 0
-
-[inventory]
-tips = True
-tabs_close_btn = True
-
 [script_manager]
 columns_order = I;Name;Type;Description;Author;Categories;ID
 columns_visible = I;Name;Type;ID
+http_proxy = :3128
 use_internal_editor = 1
+view_description = 1
+ftp_proxy = :3128
+view_categories = 1
 view_toolbar = 1
-view_description = 1
-view_categories = 1
+external_command = gedit %%s
 view_statusbar = 1
-http_proxy = :3128
-ftp_proxy = :3128
-external_command = gedit %%s
 
-[mapper]
-frames = 60
-interpolation = 1
-layout = 1
-zoom = 1.0
-ring = 30
-lower_ring = 10
-view = address;hostname;icon;ring;region;slow
+[search]
+save_time = 60;days
+file_extension = usr
+store_results = 1
+directory = 
+search_db = 1
+

network-scanner/branches/GSoC2010/umit/core/NmapParser.py

@@ -591 +591 @@
         self.nmap_xml_file = None
         self.unsaved = False
+        self.valid_xml = False
 
     def set_parser(self, parser):
@@ -607 +608 @@
         else:
             raise Exception("There's no file to be parsed!")
+        if not self.valid_xml:
+            raise Exception("Invalid XML file!")
 
     def generate_id(self):
@@ -613 +616 @@
 
     def _parse_nmaprun(self, attrs):
+        self.valid_xml = True
         d = self.nmap['nmaprun']
 

network-scanner/branches/GSoC2010/umit/core/UmitDB.py

@@ -157 +157 @@
 
         
-        creation_string = ("""CREATE TABLE scans (scans_id INTEGER \
+        creation_string = ("""CREATE TABLE IF NOT EXISTS scans (scans_id INTEGER \
                                                   PRIMARY KEY AUTOINCREMENT,
                                                   scan_name TEXT,

network-scanner/branches/GSoC2010/umit/gui/About.py

@@ -62 +62 @@
         
         self.lbl_program_description = gtk.Label(\
-            _("""Umit is network scanning frontend frontend,
+            _("""Umit is network scanning frontend,
 developed in PyGTK by Adriano Monteiro 
 Marques <adriano@umitproject.org>

network-scanner/branches/GSoC2010/umit/gui/App.py

@@ -51 +51 @@
 class App:
     def __init__(self, args=sys.argv):
+        self.main_window = None
         # Initialite the PluginEngine
         PluginEngine()
@@ -85 +86 @@
         log.debug("SIGNUM: %s" % signum)
 
-        try:
+        if self.main_window:
             scans = self.main_window.scan_notebook.get_children()
             for scan in scans:
@@ -93 +94 @@
                 self.main_window.scan_notebook.remove(scan)
                 del(scan)
-        except NameError:
-            pass
 
-        self.main_window._exit_cb()
+            self.main_window._exit_cb()
         sys.exit(signum)
 

network-scanner/branches/GSoC2010/umit/gui/BugReport.py

@@ -103 +103 @@
     def _set_category_list(self):
         # Obtained at bug tracker page source code
-        
-        self.category_list.append(["umitCore","umitCore"])
-        self.category_list.append(["umitGUI","umitGUI"])
+        # The following two lines are commented due to component deprecation
+        #self.category_list.append(["umitCore","umitCore"])
+        #self.category_list.append(["umitGUI","umitGUI"])
+        self.category_list.append(["Umit","Umit"])
         self.category_list.append(["CrashReport","CrashReport"])
         self.category_list.append(["Documentation", "Documentation"])
-        self.category_list.append(["umitWeb","umitWeb"])
+        self.category_list.append(["UmitWeb","UmitWeb"])
         self.category_list.append(["InterfaceEditor", "InterfaceEditor"])
         self.category_list.append(["NetworkInventory", "NetworkInventory"])

network-scanner/branches/GSoC2010/umit/gui/ScanNotebook.py

@@ -23 +23 @@
 
 import re
+import os
 import gtk
 import gobject
@@ -925 +926 @@
                 
                 try:
+                    
                     host_details.set_os_image(
-                        get_os_logo(host.get_osmatch()['name']))
+                        get_os_logo(host.osmatch[-1].get("name")))
                 except:
                     host_details.set_os_image(get_os_logo(''))
@@ -935 +937 @@
                     
                 icon = None
-                try:icon = get_os_icon(host.get_osmatch()['name'])
+                try:icon = get_os_icon(host.osmatch[-1].get("name"))
                 except:icon = get_os_icon('')
                     

network-scanner/branches/GSoC2010/umit/gui/Wizard.py

@@ -347 +347 @@
     def save_profile(self, widget):
         command = self.constructor.get_command('%s')
+        close_popup = True
 
         if self.directions['Choose'].profile_radio.get_active():
@@ -377 +378 @@
         elif self.notebook:
             target = self.directions['Choose'].target_entry.get_text()
-            cmd = command % target
-
-            current_page = self.notebook.get_nth_page(\
-                self.notebook.get_current_page())
-            if current_page is None:
-                current_page = self.notebook.add_scan_page(target)
-
-            current_page.execute_command(cmd)
-
-            current_page.toolbar.target_entry.selected_target = self.\
-                                directions['Choose'].target_entry.get_text()
-            current_page.command_toolbar.command_entry.command = cmd
-            current_page.command_toolbar.set_command(cmd)
-        if self.profilemanager:
-            self.update_profilemanager()
-        self.close_wizard()
+            
+            try:
+                cmd = command % target
+            except TypeError:
+                alert = HIGAlertDialog(message_format=_('Invalid Command'),\
+                                       secondary_text=_('The command is invalid.'))
+                alert.run()
+                alert.destroy()
+                close_popup = False
+            else:
+                current_page = self.notebook.get_nth_page(\
+                    self.notebook.get_current_page())
+                if current_page is None:
+                    current_page = self.notebook.add_scan_page(target)
+
+                current_page.execute_command(cmd)
+
+                current_page.toolbar.target_entry.selected_target = self.\
+                                    directions['Choose'].target_entry.get_text()
+                current_page.command_toolbar.command_entry.command = cmd
+                current_page.command_toolbar.set_command(cmd)
+        if self.profilemanager:
+            self.update_profilemanager()
+        if close_popup:    
+            self.close_wizard()
 
 class FinishPage(HIGVBox):

network-scanner/branches/GSoC2010/umit/merger/nt_appdata.py

@@ -47 +47 @@
         old_path = os.path.join(os.path.expanduser("~"), ".umit")
         old_path = old_path.decode(locale.getdefaultlocale()[1])
+        
+        backup_path = old_path + '_backup'
 
-        backup_path = old_path + '_backup'
-        if os.path.exists(old_path):
+        i = 0
+        while os.path.exists(backup_path):
+            backup_path = backup_path + i
+            i = i + 1
+        
+
+        if os.path.exists(old_path) and \
+           not os.path.exists(os.path.join(old_path, "MERGED")) \
+           and not os.path.exists(backup_path) :
             # Move the old ~/.umit to ~/.umit_backup so next time this
             # merger runs it will notice the absence of ~/.umit
-            shutil.move(old_path, backup_path)
+            # If UmitWeb is an old version, it will keep ~/.umit alive 
+            if os.path.exists(os.path.join(old_path, "umitweb.log")):
+                shutil.copytree(old_path, backup_path)
+                # Create a file to tag that was already merged
+                file = open(os.path.join(old_path, "MERGED"), 'w')
+                file.write('')
+                file.close()
+            else:
+                shutil.move(old_path, backup_path)
 
             new_path = os.path.join(BasePaths.HOME, BasePaths.UMIT_CFG_DIR)