Changeset 7907

Timestamp:

01/24/08 17:02:07 (3 years ago)

Author:

romain

svm:headrev:

c624a6cb-57d4-0310-9736-a25a8df6d016:12498

svk:copy_cache_prev:

7880

Message:

links to nuface ACLs

Location:

mirror/edenwall/nulog2/trunk

Files:

• TODO (modified) (1 diff)
• nulog-core/inl.py (modified) (1 diff)
• nulog-core/table.py (modified) (1 diff)
• nulog-web/default.nulog.conf (modified) (1 diff)
• nulog-web/nulog.pot (modified) (10 diffs)
• nulog-web/nulog.py (modified) (1 diff)
• nulog-web/po/fr/LC_MESSAGES/nulog.mo (modified) (previous)
• nulog-web/po/fr/LC_MESSAGES/nulog.po (modified) (37 diffs)
• nulog-web/tools.py (modified) (3 diffs)
• tools/traffic_maker.py (modified) (2 diffs)

mirror/edenwall/nulog2/trunk/TODO

@@ -21 +21 @@
 
 * Few features:
-- change height of table when reloading fragment (to store the same height and show ajax load icon inside).
-- use systemgraph colours.
 - hide multiplicator on histogram when ords are too big.
 - have pages w3c compliant. (with the IE compatibility, I think we can't)

mirror/edenwall/nulog2/trunk/nulog-core/inl.py

@@ -545 +545 @@
             pass
 
+    def _add_column(self, name):
+
+        self.columns += [name]
+
     def _arg_int(self, args, argname):
         """ Check if argname is in args, and if it is an integer

mirror/edenwall/nulog2/trunk/nulog-core/table.py

@@ -65 +65 @@
         else:
             result += entry[5:10]
+
+            # Stock ACL number, if exists, in 'acl' field
+            prefix = entry[9].split(':')
+            if len(prefix) > 2:
+                # Add column if doesn't exit
+                try:
+                    # If doesn't exist it will raise an exception
+                    self.columns.index('acl')
+                except ValueError:
+                    self._add_column('acl')
+
+                result += (prefix[1],)
 
         if not hasattr(self, 'states'):

mirror/edenwall/nulog2/trunk/nulog-web/default.nulog.conf

@@ -7 +7 @@
 # Title displayed on top of each page.
 maintitle=Log FW for EdenWall
+
+# Link to Nuface ACLs
+# Note: if you don't use nuface, blank this field
+nuface_acl=https://fydelkass.inl.fr/nuface/acls.php?nulog=1&acl=%%s
 
 [Sessions]

mirror/edenwall/nulog2/trunk/nulog-web/nulog.pot

@@ -199 +199 @@
 msgstr ""
 
-#: infopage.py:232 tools.py:164
+#: infopage.py:232 tools.py:165
 msgid "Dest port"
 msgstr ""
@@ -259 +259 @@
 msgstr ""
 
-#: infopage.py:305 tools.py:184
+#: infopage.py:305 tools.py:185
 msgid "Application"
 msgstr ""
@@ -316 +316 @@
 msgstr ""
 
-#: tools.py:145
+#: tools.py:146
 msgid "TCP ports"
 msgstr ""
 
-#: tools.py:146
+#: tools.py:147
 msgid "UDP ports"
 msgstr ""
 
-#: tools.py:147
+#: tools.py:148
 msgid "source IP"
 msgstr ""
 
-#: tools.py:148
+#: tools.py:149
 msgid "destination IP"
 msgstr ""
 
-#: tools.py:149
+#: tools.py:150
 msgid "Users"
 msgstr ""
 
-#: tools.py:150 default.conf:51 ,default.conf:153
+#: tools.py:151 no_users.conf:53 ,no_users.conf:137 ,default.conf:51
+#: ,default.conf:153
 msgid "Packet list"
 msgstr ""
 
-#: tools.py:151
+#: tools.py:152
 msgid "Connected users"
 msgstr ""
 
-#: tools.py:152
+#: tools.py:153
 msgid "Packet info"
 msgstr ""
 
-#: tools.py:153
+#: tools.py:154
 msgid "Applications"
 msgstr ""
 
-#: tools.py:154
+#: tools.py:155
 msgid "Connection tracking"
 msgstr ""
 
-#: tools.py:159
+#: tools.py:160
 msgid "TCP dest port"
 msgstr ""
 
-#: tools.py:160
+#: tools.py:161
 msgid "TCP source port"
 msgstr ""
 
-#: tools.py:161
+#: tools.py:162
 msgid "UDP dest port"
 msgstr ""
 
-#: tools.py:162
+#: tools.py:163
 msgid "UDP source port"
 msgstr ""
 
-#: tools.py:163 xml/search.xml:21
+#: tools.py:164 xml/search.xml:21
 msgid "Source port"
 msgstr ""
 
-#: tools.py:165 xml/search.xml:40
+#: tools.py:166 xml/search.xml:40
 msgid "Source"
 msgstr ""
 
-#: tools.py:166
+#: tools.py:167
 msgid "Destination"
 msgstr ""
 
-#: tools.py:167 xml/search.xml:23
+#: tools.py:168 xml/search.xml:23
 msgid "Address"
 msgstr ""
 
-#: tools.py:169 tools.py:170
+#: tools.py:170 tools.py:171
 msgid "User"
 msgstr ""
 
-#: tools.py:171
+#: tools.py:172
 msgid "Username contains"
 msgstr ""
 
-#: tools.py:172 xml/search.xml:24
+#: tools.py:173 xml/search.xml:24
 msgid "State"
 msgstr ""
 
-#: tools.py:173
+#: tools.py:174
 msgid "Proto"
 msgstr ""
 
-#: tools.py:179
+#: tools.py:180
 msgid "Packets"
 msgstr ""
 
-#: tools.py:180
+#: tools.py:181
 msgid "First packet"
 msgstr ""
 
-#: tools.py:181
+#: tools.py:182
 msgid "Last packet"
 msgstr ""
 
-#: tools.py:182
+#: tools.py:183
 msgid "Time"
 msgstr ""
 
-#: tools.py:186
+#: tools.py:187 xml/search.xml:58
 msgid "Prefix"
 msgstr ""
 
-#: tools.py:187 xml/search.xml:56
+#: tools.py:188
+msgid "ACL"
+msgstr ""
+
+#: tools.py:189 xml/search.xml:56
 msgid "Begin"
 msgstr ""
 
-#: tools.py:188 xml/search.xml:57
+#: tools.py:190 xml/search.xml:57
 msgid "End"
 msgstr ""
 
-#: tools.py:189 xml/edennavbar.xml:4
+#: tools.py:191 xml/edennavbar.xml:10
 msgid "System"
 msgstr ""
 
-#: tools.py:311
+#: tools.py:317
 msgid "No sort"
 msgstr ""
 
-#: tools.py:313
+#: tools.py:319
 #, python-format
 msgid "Sorted by %s"
 msgstr ""
 
-#: tools.py:394
+#: tools.py:400
 msgid "for"
 msgstr ""
 
-#: tools.py:412 tools.py:482
+#: tools.py:418 tools.py:488
 #, python-format
 msgid "%s isn't a valid argument name"
 msgstr ""
 
-#: tools.py:419
+#: tools.py:425
 #, python-format
 msgid "'%(key)s' isn't a valid value for %(value)s argument"
 msgstr ""
 
-#: tools.py:432
+#: tools.py:438
 #, python-format
 msgid "%s value may be in range 1-65535"
 msgstr ""
 
-#: tools.py:442
+#: tools.py:448
 #, python-format
 msgid "%s value may be an integer"
 msgstr ""
 
-#: tools.py:447
+#: tools.py:453
 #, python-format
 msgid "%(key)s value may be tcp, udp or icmp (and not %(value)s)"
 msgstr ""
 
-#: tools.py:457
+#: tools.py:463
 msgid "Please give a correct IP address or hostname"
 msgstr ""
@@ -486 +491 @@
 msgstr ""
 
+#: xml/edennavbar.xml:4
+msgid "/"
+msgstr ""
+
 #: xml/search.xml:46
 msgid "Drop"
 msgstr ""
 
-#: xml/edennavbar.xml:5
+#: xml/edennavbar.xml:11
 msgid "Nuface"
 msgstr ""
@@ -502 +511 @@
 msgstr ""
 
-#: xml/edennavbar.xml:7
+#: xml/edennavbar.xml:13
 msgid "Conntrack"
 msgstr ""
@@ -510 +519 @@
 msgstr ""
 
-#: xml/edennavbar.xml:2
+#: xml/edennavbar.xml:7
 msgid "Home"
 msgstr ""
 
-#: xml/nulog.xml:4
+#: xml/404.xml:4 xml/nulog.xml:4
 msgid "Nulog2.0: firewall logs analysis"
 msgstr ""
@@ -534 +543 @@
 msgstr ""
 
-#: xml/edennavbar.xml:6
+#: xml/edennavbar.xml:12
 msgid "Nulog"
 msgstr ""
@@ -550 +559 @@
 msgstr ""
 
-#: xml/search.xml:62 xml/search.xml:64
+#: xml/search.xml:63 xml/search.xml:65
 msgid "'dd/mm/yy' or<br/>'dd/mm/yy HH:MM:SS'"
 msgstr ""
@@ -574 +583 @@
 msgstr ""
 
-#: xml/edennavbar.xml:3
+#: xml/edennavbar.xml:9
 msgid "Network"
 msgstr ""
 
-#: no_users.conf:107
-msgid "Most TCP protocols:"
-msgstr ""
-
-#: no_users.conf:123
-msgid "IP Sources"
-msgstr ""
-
-#: default.conf:97
+#: no_users.conf:112 ,default.conf:114
+msgid "TCP ports:"
+msgstr ""
+
+#: default.conf:146
+msgid "Applications:"
+msgstr ""
+
+#: no_users.conf:91 ,default.conf:92
+msgid "Bad UDP packets:"
+msgstr ""
+
+#: no_users.conf:120
+msgid "Destinations IP:"
+msgstr ""
+
+#: no_users.conf:23 ,no_users.conf:56
+msgid "This feature is disabled because you don't use NuFW."
+msgstr ""
+
+#: no_users.conf:83
+msgid "Destinations:"
+msgstr ""
+
+#: no_users.conf:73 ,default.conf:80
+msgid "Bad TCP packets:"
+msgstr ""
+
+#: default.conf:165
+msgid "Users sessions:"
+msgstr ""
+
+#: no_users.conf:96 ,default.conf:97
 msgid "Packets:"
 msgstr ""
 
-#: default.conf:138
+#: default.conf:121
+msgid "Destination IP:"
+msgstr ""
+
+#: no_users.conf:129 ,default.conf:138
 msgid "Source IP:"
+msgstr ""
+
+#: default.conf:84
+msgid "Bad Hosts packets:"
+msgstr ""
+
+#: no_users.conf:40 ,default.conf:40
+msgid "Host information"
+msgstr ""
+
+#: default.conf:74
+msgid "Top User connections"
 msgstr ""
 
@@ -598 +647 @@
 msgstr ""
 
-#: no_users.conf:80
-msgid "Destinations:"
-msgstr ""
-
-#: no_users.conf:92
-msgid "Dropped packets:"
-msgstr ""
-
-#: default.conf:121
-msgid "Destination IP:"
-msgstr ""
-
-#: no_users.conf:40 ,default.conf:40
-msgid "Host information"
-msgstr ""
-
-#: default.conf:146
-msgid "Applications:"
-msgstr ""
-
-#: no_users.conf:23 ,no_users.conf:54
-msgid "This feature is disabled because you don't use NuFW."
-msgstr ""
-
-#: no_users.conf:70 ,default.conf:80
-msgid "Bad TCP packets:"
-msgstr ""
-
-#: default.conf:164
-msgid "Users sessions:"
-msgstr ""
-
-#: default.conf:84
-msgid "Bad Hosts packets:"
-msgstr ""
-
-#: no_users.conf:87 ,default.conf:92
-msgid "Bad UDP packets:"
-msgstr ""
-
 #: default.conf:130
 msgid "Users:"
 msgstr ""
 
-#: default.conf:114
-msgid "TCP ports:"
-msgstr ""
-
-#: default.conf:74
-msgid "Top User connections"
-msgstr ""
-
-#: no_users.conf:74
+#: no_users.conf:77
 msgid "Source dropped packets:"
 msgstr ""
-
-#: no_users.conf:114
-msgid "Destinations"
-msgstr ""

mirror/edenwall/nulog2/trunk/nulog-web/nulog.py

@@ -306 +306 @@
 
     tools.DATETIME_FORMAT = parser.get('Misc', 'datetime')
+    tools.NUFACE_URL = parser.get('Links', 'nuface_acl')
     csv.MAX_RESULTS = int(parser.get('Misc', 'csv_max_results'))
 

mirror/edenwall/nulog2/trunk/nulog-web/po/fr/LC_MESSAGES/nulog.po

@@ -8 +8 @@
 "Project-Id-Version: nulog\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-01-17 10:22+0100\n"
-"Last-Translator: Eric Leblond <eric@inl.fr>\n"
+"PO-Revision-Date: 2008-01-24 17:01+0100\n"
+"Last-Translator: Romain Bignon <romain@vaginus.org>\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16 +16 @@
 "X-Generator: KBabel 1.11.4\n"
 
-#: tools.py:447
+#: tools.py:453
 #, python-format
 msgid "%(key)s value may be tcp, udp or icmp (and not %(value)s)"
 msgstr "La valeur de %(key)s doit être tcp, udp ou icmp (et non %(value)s)"
 
-#: tools.py:412
-#: tools.py:482
+#: tools.py:418 tools.py:488
 #, python-format
 msgid "%s isn't a valid argument name"
 msgstr "%s n'est pas un nom d'argument valide"
 
-#: tools.py:442
+#: tools.py:448
 #, python-format
 msgid "%s value may be an integer"
 msgstr "%s doit être un entier"
 
-#: tools.py:432
+#: tools.py:438
 #, python-format
 msgid "%s value may be in range 1-65535"
 msgstr "La valeur de %s doit être compris entre 1 et 65535"
 
-#: tools.py:419
+#: tools.py:425
 #, python-format
 msgid "'%(key)s' isn't a valid value for %(value)s argument"
 msgstr "'%(key)s' n'est pas une valeur correcte pour l'argument '%(value)s'"
 
-#: xml/search.xml:62
-#: xml/search.xml:64
+#: xml/search.xml:63 xml/search.xml:65
 msgid "'dd/mm/yy' or<br/>'dd/mm/yy HH:MM:SS'"
 msgstr "'jj/mm/aa' ou<br />'jj/mm/aa HH:MM:SS'"
+
+#: xml/edennavbar.xml:4
+msgid "/"
+msgstr "/"
 
 #: frags.py:174
@@ -59 +61 @@
 msgstr "Nombre ACK"
 
-#: frags.py:122
-#: table.py:219
+#: tools.py:188
+msgid "ACL"
+msgstr "ACL"
+
+#: frags.py:122 table.py:219
 msgid "Active connection tracking"
 msgstr "Connexions actives."
@@ -72 +77 @@
 msgstr "Informations additionnelles"
 
-#: tools.py:167
-#: xml/search.xml:23
+#: tools.py:168 xml/search.xml:23
 msgid "Address"
 msgstr "Adresse"
 
-#: frags.py:104
-#: table.py:189
-#: table.py:209
+#: frags.py:104 table.py:189 table.py:209
 msgid "All"
 msgstr "Tous"
 
-#: xml/search.xml:30
-#: xml/search.xml:45
+#: xml/search.xml:30 xml/search.xml:45
 msgid "Any"
 msgstr "Tous"
 
-#: infopage.py:305
-#: tools.py:184
+#: infopage.py:305 tools.py:185
 msgid "Application"
 msgstr "Application"
 
-#: tools.py:153
+#: tools.py:154
 msgid "Applications"
 msgstr "Applications"
@@ -105 +105 @@
 msgstr "HÎtes rejetés :"
 
-#: no_users.conf:70
-#: ,default.conf:80
+#: no_users.conf:73 ,default.conf:80
 msgid "Bad TCP packets:"
 msgstr "Paquets TCP rejetés :"
 
-#: no_users.conf:87
-#: ,default.conf:92
+#: no_users.conf:91 ,default.conf:92
 msgid "Bad UDP packets:"
 msgstr "Paquets UDP rejetés :"
 
-#: tools.py:187
-#: xml/search.xml:56
+#: tools.py:189 xml/search.xml:56
 msgid "Begin"
 msgstr "Début"
@@ -136 +133 @@
 msgstr "Fermée"
 
-#: frags.py:127
-#: table.py:224
+#: frags.py:127 table.py:224
 msgid "Closed"
 msgstr "Fermée"
 
-#: tools.py:151
+#: tools.py:152
 msgid "Connected users"
 msgstr "Utilisateurs connectés"
@@ -149 +145 @@
 msgstr "Volumétrie de la connexion"
 
-#: tools.py:154
+#: tools.py:155
 msgid "Connection tracking"
 msgstr "Connexions actives"
 
-#: xml/edennavbar.xml:7
+#: xml/edennavbar.xml:13
 msgid "Conntrack"
 msgstr "Conntrack"
@@ -161 +157 @@
 msgstr "Dest hÃŽte"
 
-#: infopage.py:232
-#: tools.py:164
+#: infopage.py:232 tools.py:165
 msgid "Dest port"
 msgstr "Dest port"
@@ -170 +165 @@
 msgstr "Destinataire"
 
-#: tools.py:166
+#: tools.py:167
 msgid "Destination"
 msgstr "Destination"
@@ -182 +177 @@
 msgstr "Port de destination"
 
-#: no_users.conf:114
-#, fuzzy
-msgid "Destinations"
-msgstr "Destinations :"
-
-#: no_users.conf:80
+#: no_users.conf:120
+msgid "Destinations IP:"
+msgstr "IP Destinations :"
+
+#: no_users.conf:83
 msgid "Destinations:"
 msgstr "Destinations :"
@@ -200 +194 @@
 msgstr "Rejeté"
 
-#: frags.py:107
-#: table.py:214
+#: frags.py:107 table.py:214
 msgid "Dropped"
 msgstr "Rejeté"
@@ -209 +202 @@
 msgstr "Paquets rejetés"
 
-#: no_users.conf:92
-#, fuzzy
-msgid "Dropped packets:"
-msgstr "Paquets rejetés"
-
-#: tools.py:188
-#: xml/search.xml:57
+#: tools.py:190 xml/search.xml:57
 msgid "End"
 msgstr "Fin"
@@ -236 +223 @@
 msgstr "Erreur : Impossible de récupérer la table."
 
-#: frags.py:117
-#: table.py:199
+#: frags.py:117 table.py:199
 msgid "Established"
 msgstr "Établis."
@@ -249 +235 @@
 msgstr "Fichier introuvable"
 
-#: tools.py:180
+#: tools.py:181
 msgid "First packet"
 msgstr "Premier paquet"
@@ -265 +251 @@
 msgstr "Aide"
 
-#: xml/edennavbar.xml:2
+#: xml/edennavbar.xml:7
 msgid "Home"
 msgstr "Accueil"
 
-#: no_users.conf:40
-#: ,default.conf:40
+#: no_users.conf:40 ,default.conf:40
 msgid "Host information"
 msgstr "Informations hÃŽte"
@@ -282 +267 @@
 msgstr "Type ICMP"
 
-#: no_users.conf:123
-#, fuzzy
-msgid "IP Sources"
-msgstr "Source"
-
 #: infopage.py:146
 msgid "In interface"
@@ -295 +275 @@
 msgstr "Heure d'arrivée"
 
-#: tools.py:181
+#: tools.py:182
 msgid "Last packet"
 msgstr "Dernier paquet"
@@ -312 +292 @@
 msgstr "Identifié comme %s"
 
-#: nulog.py:160
-#: pages.py:150
+#: nulog.py:160 pages.py:150
 msgid "Login"
 msgstr "S'identifier"
@@ -337 +316 @@
 msgstr "Marque"
 
-#: no_users.conf:107
-#, fuzzy
-msgid "Most TCP protocols:"
-msgstr "Ports TCP"
-
-#: xml/edennavbar.xml:3
+#: xml/edennavbar.xml:9
 msgid "Network"
 msgstr "Réseau"
 
-#: graph.py:267
-#: table.py:86
+#: graph.py:267 table.py:86
 msgid "No data"
 msgstr "Aucune donnée"
 
-#: tools.py:311
+#: tools.py:317
 msgid "No sort"
 msgstr "Aucun tri"
@@ -363 +336 @@
 msgstr "Rien"
 
-#: xml/edennavbar.xml:5
+#: xml/edennavbar.xml:11
 msgid "Nuface"
 msgstr "Nuface"
 
-#: xml/edennavbar.xml:6
+#: xml/edennavbar.xml:12
 msgid "Nulog"
 msgstr "Nulog"
 
 #: frags.py:175
-msgid "Nulog can't fetch data from backend. Please check your configuration file"
-msgstr "Nulog ne peut récupérer de donnée depuis le backend. Merci de vérifier votre fichier de configuration."
-
-#: xml/nulog.xml:4
+msgid ""
+"Nulog can't fetch data from backend. Please check your configuration file"
+msgstr ""
+"Nulog ne peut récupérer de donnée depuis le backend. Merci de vérifier votre "
+"fichier de configuration."
+
+#: xml/404.xml:4 xml/nulog.xml:4
 msgid "Nulog2.0: firewall logs analysis"
 msgstr "Nulog2.0 : interface d'analyse des journaux du pare-feu"
@@ -383 +359 @@
 msgstr "Ouverte"
 
-#: frags.py:114
-#: table.py:194
+#: frags.py:114 table.py:194
 msgid "Opened"
 msgstr "Ouverte"
@@ -412 +387 @@
 msgstr "ID du paquet"
 
-#: tools.py:152
+#: tools.py:153
 msgid "Packet info"
 msgstr "Informations paquet"
 
-#: tools.py:150
-#: default.conf:51
+#: tools.py:151 no_users.conf:53 ,no_users.conf:137 ,default.conf:51
 #: ,default.conf:153
 msgid "Packet list"
 msgstr "Liste des paquets"
 
-#: tools.py:179
+#: tools.py:180
 msgid "Packets"
 msgstr "Paquets"
@@ -434 +408 @@
 msgstr "Paquets sortants"
 
-#: default.conf:97
+#: no_users.conf:96 ,default.conf:97
 msgid "Packets:"
 msgstr "Paquets"
@@ -446 +420 @@
 msgstr "Mot de passe :"
 
-#: tools.py:457
+#: tools.py:463
 msgid "Please give a correct IP address or hostname"
 msgstr "Veuillez entrer une adresse IP ou un nom d'hÃŽte correct."
@@ -454 +428 @@
 msgstr "Veuillez entrer un rendu correct !"
 
-#: no_users.conf:26
-#: ,default.conf:26
+#: no_users.conf:26 ,default.conf:26
 msgid "Port information"
 msgstr "Informations port"
 
-#: tools.py:186
+#: tools.py:187 xml/search.xml:58
 msgid "Prefix"
 msgstr "Préfixe"
 
-#: tools.py:173
+#: tools.py:174
 msgid "Proto"
 msgstr "Proto"
@@ -504 +477 @@
 msgstr "Tri"
 
-#: tools.py:313
+#: tools.py:319
 #, python-format
 msgid "Sorted by %s"
 msgstr "Trié par %s"
 
-#: tools.py:165
-#: xml/search.xml:40
+#: tools.py:166 xml/search.xml:40
 msgid "Source"
 msgstr "Source"
 
-#: default.conf:138
+#: no_users.conf:129 ,default.conf:138
 msgid "Source IP:"
 msgstr "Source"
 
-#: no_users.conf:74
+#: no_users.conf:77
 msgid "Source dropped packets:"
 msgstr "HÎtes sources rejetés :"
 
-#: tools.py:163
-#: xml/search.xml:21
+#: tools.py:164 xml/search.xml:21
 msgid "Source port"
 msgstr "Port source"
@@ -539 +510 @@
 msgstr "Port source"
 
-#: tools.py:172
-#: xml/search.xml:24
+#: tools.py:173 xml/search.xml:24
 msgid "State"
 msgstr "État"
@@ -548 +518 @@
 msgstr "État :"
 
-#: tools.py:189
-#: xml/edennavbar.xml:4
+#: tools.py:191 xml/edennavbar.xml:10
 msgid "System"
 msgstr "SystÚme"
@@ -557 +526 @@
 msgstr "Fenêtre TCP"
 
-#: tools.py:159
+#: tools.py:160
 msgid "TCP dest port"
 msgstr "Port dest TCP"
 
-#: tools.py:145
+#: tools.py:146
 msgid "TCP ports"
 msgstr "Ports TCP"
 
-#: default.conf:114
+#: no_users.conf:112 ,default.conf:114
 msgid "TCP ports:"
 msgstr "Ports TCP"
 
-#: tools.py:160
+#: tools.py:161
 msgid "TCP source port"
 msgstr "Port source TCP"
@@ -581 +550 @@
 msgstr "TTL"
 
-#: no_users.conf:23
-#: ,no_users.conf:54
+#: no_users.conf:23 ,no_users.conf:56
 msgid "This feature is disabled because you don't use NuFW."
-msgstr "Cette fonctionnalité est désactivée parce que vous n'utilisez pas NuFW."
-
-#: tools.py:182
+msgstr ""
+"Cette fonctionnalité est désactivée parce que vous n'utilisez pas NuFW."
+
+#: tools.py:183
 msgid "Time"
 msgstr "Date"
@@ -606 +575 @@
 msgstr "Taille totale :"
 
-#: tools.py:161
+#: tools.py:162
 msgid "UDP dest port"
 msgstr "Port dest UDP"
 
-#: tools.py:146
+#: tools.py:147
 msgid "UDP ports"
 msgstr "Ports UDP"
 
-#: tools.py:162
+#: tools.py:163
 msgid "UDP source port"
 msgstr "Port source UDP"
@@ -626 +595 @@
 msgstr "URGP"
 
-#: graph.py:264
-#: table.py:83
+#: graph.py:264 table.py:83
 msgid "Unable to find this table"
 msgstr "Impossible de trouver cette table"
 
-#: tools.py:169
-#: tools.py:170
+#: tools.py:170 tools.py:171
 msgid "User"
 msgstr "Utilisateur"
 
-#: infopage.py:94
-#: default.conf:18
+#: infopage.py:94 default.conf:18
 msgid "User information"
 msgstr "Informations sur l'utilisateur"
 
-#: xml/left.xml:47
-#: default.conf:57
+#: xml/left.xml:47 default.conf:57
 msgid "User session history"
 msgstr "Historique des sessions utilisateurs"
@@ -650 +615 @@
 msgstr "UserID"
 
-#: infopage.py:98
-#: xml/search.xml:19
+#: infopage.py:98 xml/search.xml:19
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: tools.py:171
+#: tools.py:172
 msgid "Username contains"
 msgstr "Le nom d'utilisateur contient"
@@ -663 +627 @@
 msgstr "Nom d'utilisateur:"
 
-#: tools.py:149
+#: tools.py:150
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: default.conf:164
+#: default.conf:165
 msgid "Users sessions:"
 msgstr "Sessions des utilisateurs :"
@@ -679 +643 @@
 msgstr "utilisateur(s) connecté(s)"
 
-#: tools.py:148
+#: tools.py:149
 msgid "destination IP"
 msgstr "IP Destination"
@@ -691 +655 @@
 msgstr "entrées dans ulog"
 
-#: tools.py:394
+#: tools.py:400
 msgid "for"
 msgstr "pour"
@@ -707 +671 @@
 msgstr "précédent"
 
-#: tools.py:147
+#: tools.py:148
 msgid "source IP"
 msgstr "IP source"
-

mirror/edenwall/nulog2/trunk/nulog-web/tools.py

@@ -45 +45 @@
 
 DATETIME_FORMAT = '%m-%y-%d %H:%M:%S'
+NUFACE_URL = None
 
 def parseDatetime(gvalue, endofday=False):
@@ -185 +186 @@
                           'tiny':       self.ArgType(filter=False),
                           'oob_prefix': self.ArgType(_('Prefix')),
+                          'acl':        self.ArgType(_('ACL'),             self._check_int,       self._data_acl),
                           'start_time': self.ArgType(_('Begin')),
                           'end_time':   self.ArgType(_('End')),
@@ -255 +257 @@
         else:
             return value
+
+    def _data_acl(self, value):
+
+        return tags.a(href=NUFACE_URL % value)[tags.img(src='img/acl.png')]
 
     def _data_ip(self, value):

mirror/edenwall/nulog2/trunk/tools/traffic_maker.py

@@ -45 +45 @@
     apps = ['/usr/bin/ssh', '/usr/bin/firefox', '/usr/bin/irssi', '/bin/zsh', '/usr/bin/menareants/', '/usr/bin/bzflag',
             '/usr/local/bin/frozzen-bubble', '/home/gryzor/tachatte/tachatte.sh']
-    prefixs = ['DROPPED', '', '', 'AUTHENTIFICATED', 'AUTHENTIFICATED']
+    prefixs = [['DROPPED', 'FWD:5:DROPPED', 'IN:8:DROPPED'],
+               '',
+               '',
+               'AUTHENTIFICATED',
+               'AUTHENTIFICATED']
     ports = [21,22,23,80,8080,6667,6666,5130,5461,113,447,69]
 
@@ -105 +109 @@
         else:
             prefix = self.prefixs[state]
+            if isinstance(prefix, list):
+                prefix = choice(prefix)
             os = choice(self.OSs)
             app = choice(self.apps)