webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 02:12:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

WiFi: Show EAP status on wireless client page

Browse Source 
This patch adds some status information so that we know what
authentication an access point is using.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-05-16 15:05:25 +02:00
parent f2c9478008
commit 0628d956a7
11 changed files with 118 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/language_issues.es
View File

@@ -1175,6 +1175,8 @@ WARNING: untranslated string: wlan client configuration
WARNING: untranslated string: wlan client disconnected WARNING: untranslated string: wlan client disconnected
WARNING: untranslated string: wlan client duplicate ssid WARNING: untranslated string: wlan client duplicate ssid
WARNING: untranslated string: wlan client eap authentication method WARNING: untranslated string: wlan client eap authentication method
WARNING: untranslated string: wlan client eap phase2 method
WARNING: untranslated string: wlan client eap state
WARNING: untranslated string: wlan client edit entry WARNING: untranslated string: wlan client edit entry
WARNING: untranslated string: wlan client encryption WARNING: untranslated string: wlan client encryption
WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption eap
@@ -1186,6 +1188,7 @@ WARNING: untranslated string: wlan client group cipher
WARNING: untranslated string: wlan client group key algorithm WARNING: untranslated string: wlan client group key algorithm
WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client identity
WARNING: untranslated string: wlan client invalid key length WARNING: untranslated string: wlan client invalid key length
WARNING: untranslated string: wlan client method
WARNING: untranslated string: wlan client new entry WARNING: untranslated string: wlan client new entry
WARNING: untranslated string: wlan client new network WARNING: untranslated string: wlan client new network
WARNING: untranslated string: wlan client pairwise cipher WARNING: untranslated string: wlan client pairwise cipher
@@ -1195,6 +1198,8 @@ WARNING: untranslated string: wlan client password
WARNING: untranslated string: wlan client psk WARNING: untranslated string: wlan client psk
WARNING: untranslated string: wlan client ssid WARNING: untranslated string: wlan client ssid
WARNING: untranslated string: wlan client tkip WARNING: untranslated string: wlan client tkip
WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version
WARNING: untranslated string: wlan client wpa mode WARNING: untranslated string: wlan client wpa mode
WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode all
WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp ccmp

5
doc/language_issues.fr
View File

@@ -1192,6 +1192,8 @@ WARNING: untranslated string: wlan client configuration
WARNING: untranslated string: wlan client disconnected WARNING: untranslated string: wlan client disconnected
WARNING: untranslated string: wlan client duplicate ssid WARNING: untranslated string: wlan client duplicate ssid
WARNING: untranslated string: wlan client eap authentication method WARNING: untranslated string: wlan client eap authentication method
WARNING: untranslated string: wlan client eap phase2 method
WARNING: untranslated string: wlan client eap state
WARNING: untranslated string: wlan client edit entry WARNING: untranslated string: wlan client edit entry
WARNING: untranslated string: wlan client encryption WARNING: untranslated string: wlan client encryption
WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption eap
@@ -1203,6 +1205,7 @@ WARNING: untranslated string: wlan client group cipher
WARNING: untranslated string: wlan client group key algorithm WARNING: untranslated string: wlan client group key algorithm
WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client identity
WARNING: untranslated string: wlan client invalid key length WARNING: untranslated string: wlan client invalid key length
WARNING: untranslated string: wlan client method
WARNING: untranslated string: wlan client new entry WARNING: untranslated string: wlan client new entry
WARNING: untranslated string: wlan client new network WARNING: untranslated string: wlan client new network
WARNING: untranslated string: wlan client pairwise cipher WARNING: untranslated string: wlan client pairwise cipher
@@ -1212,6 +1215,8 @@ WARNING: untranslated string: wlan client password
WARNING: untranslated string: wlan client psk WARNING: untranslated string: wlan client psk
WARNING: untranslated string: wlan client ssid WARNING: untranslated string: wlan client ssid
WARNING: untranslated string: wlan client tkip WARNING: untranslated string: wlan client tkip
WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version
WARNING: untranslated string: wlan client wpa mode WARNING: untranslated string: wlan client wpa mode
WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode all
WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp ccmp

5
doc/language_issues.it
View File

@@ -842,6 +842,11 @@ WARNING: untranslated string: wlan client auth peap
WARNING: untranslated string: wlan client auth ttls WARNING: untranslated string: wlan client auth ttls
WARNING: untranslated string: wlan client authentication settings WARNING: untranslated string: wlan client authentication settings
WARNING: untranslated string: wlan client eap authentication method WARNING: untranslated string: wlan client eap authentication method
WARNING: untranslated string: wlan client eap phase2 method
WARNING: untranslated string: wlan client eap state
WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption eap
WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client identity
WARNING: untranslated string: wlan client method
WARNING: untranslated string: wlan client password WARNING: untranslated string: wlan client password
WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version

5
doc/language_issues.nl
View File

@@ -890,6 +890,11 @@ WARNING: untranslated string: wlan client auth peap
WARNING: untranslated string: wlan client auth ttls WARNING: untranslated string: wlan client auth ttls
WARNING: untranslated string: wlan client authentication settings WARNING: untranslated string: wlan client authentication settings
WARNING: untranslated string: wlan client eap authentication method WARNING: untranslated string: wlan client eap authentication method
WARNING: untranslated string: wlan client eap phase2 method
WARNING: untranslated string: wlan client eap state
WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption eap
WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client identity
WARNING: untranslated string: wlan client method
WARNING: untranslated string: wlan client password WARNING: untranslated string: wlan client password
WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version

5
doc/language_issues.pl
View File

@@ -1175,6 +1175,8 @@ WARNING: untranslated string: wlan client configuration
WARNING: untranslated string: wlan client disconnected WARNING: untranslated string: wlan client disconnected
WARNING: untranslated string: wlan client duplicate ssid WARNING: untranslated string: wlan client duplicate ssid
WARNING: untranslated string: wlan client eap authentication method WARNING: untranslated string: wlan client eap authentication method
WARNING: untranslated string: wlan client eap phase2 method
WARNING: untranslated string: wlan client eap state
WARNING: untranslated string: wlan client edit entry WARNING: untranslated string: wlan client edit entry
WARNING: untranslated string: wlan client encryption WARNING: untranslated string: wlan client encryption
WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption eap
@@ -1186,6 +1188,7 @@ WARNING: untranslated string: wlan client group cipher
WARNING: untranslated string: wlan client group key algorithm WARNING: untranslated string: wlan client group key algorithm
WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client identity
WARNING: untranslated string: wlan client invalid key length WARNING: untranslated string: wlan client invalid key length
WARNING: untranslated string: wlan client method
WARNING: untranslated string: wlan client new entry WARNING: untranslated string: wlan client new entry
WARNING: untranslated string: wlan client new network WARNING: untranslated string: wlan client new network
WARNING: untranslated string: wlan client pairwise cipher WARNING: untranslated string: wlan client pairwise cipher
@@ -1195,6 +1198,8 @@ WARNING: untranslated string: wlan client password
WARNING: untranslated string: wlan client psk WARNING: untranslated string: wlan client psk
WARNING: untranslated string: wlan client ssid WARNING: untranslated string: wlan client ssid
WARNING: untranslated string: wlan client tkip WARNING: untranslated string: wlan client tkip
WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version
WARNING: untranslated string: wlan client wpa mode WARNING: untranslated string: wlan client wpa mode
WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode all
WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp ccmp

5
doc/language_issues.ru
View File

@@ -1170,6 +1170,8 @@ WARNING: untranslated string: wlan client configuration
WARNING: untranslated string: wlan client disconnected WARNING: untranslated string: wlan client disconnected
WARNING: untranslated string: wlan client duplicate ssid WARNING: untranslated string: wlan client duplicate ssid
WARNING: untranslated string: wlan client eap authentication method WARNING: untranslated string: wlan client eap authentication method
WARNING: untranslated string: wlan client eap phase2 method
WARNING: untranslated string: wlan client eap state
WARNING: untranslated string: wlan client edit entry WARNING: untranslated string: wlan client edit entry
WARNING: untranslated string: wlan client encryption WARNING: untranslated string: wlan client encryption
WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption eap
@@ -1181,6 +1183,7 @@ WARNING: untranslated string: wlan client group cipher
WARNING: untranslated string: wlan client group key algorithm WARNING: untranslated string: wlan client group key algorithm
WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client identity
WARNING: untranslated string: wlan client invalid key length WARNING: untranslated string: wlan client invalid key length
WARNING: untranslated string: wlan client method
WARNING: untranslated string: wlan client new entry WARNING: untranslated string: wlan client new entry
WARNING: untranslated string: wlan client new network WARNING: untranslated string: wlan client new network
WARNING: untranslated string: wlan client pairwise cipher WARNING: untranslated string: wlan client pairwise cipher
@@ -1190,6 +1193,8 @@ WARNING: untranslated string: wlan client password
WARNING: untranslated string: wlan client psk WARNING: untranslated string: wlan client psk
WARNING: untranslated string: wlan client ssid WARNING: untranslated string: wlan client ssid
WARNING: untranslated string: wlan client tkip WARNING: untranslated string: wlan client tkip
WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version
WARNING: untranslated string: wlan client wpa mode WARNING: untranslated string: wlan client wpa mode
WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode all
WARNING: untranslated string: wlan client wpa mode ccmp ccmp WARNING: untranslated string: wlan client wpa mode ccmp ccmp

5
doc/language_issues.tr
View File

@@ -773,6 +773,11 @@ WARNING: untranslated string: wlan client auth peap
WARNING: untranslated string: wlan client auth ttls WARNING: untranslated string: wlan client auth ttls
WARNING: untranslated string: wlan client authentication settings WARNING: untranslated string: wlan client authentication settings
WARNING: untranslated string: wlan client eap authentication method WARNING: untranslated string: wlan client eap authentication method
WARNING: untranslated string: wlan client eap phase2 method
WARNING: untranslated string: wlan client eap state
WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption eap
WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client identity
WARNING: untranslated string: wlan client method
WARNING: untranslated string: wlan client password WARNING: untranslated string: wlan client password
WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version

20
doc/language_missings
View File

@@ -612,6 +612,8 @@
< wlan client disconnected < wlan client disconnected
< wlan client duplicate ssid < wlan client duplicate ssid
< wlan client eap authentication method < wlan client eap authentication method
< wlan client eap phase2 method
< wlan client eap state
< wlan client edit entry < wlan client edit entry
< wlan client encryption < wlan client encryption
< wlan client encryption eap < wlan client encryption eap
@@ -623,6 +625,7 @@
< wlan client group key algorithm < wlan client group key algorithm
< wlan client identity < wlan client identity
< wlan client invalid key length < wlan client invalid key length
< wlan client method
< wlan client new entry < wlan client new entry
< wlan client new network < wlan client new network
< wlan client pairwise cipher < wlan client pairwise cipher
@@ -633,6 +636,8 @@
< wlan clients < wlan clients
< wlan client ssid < wlan client ssid
< wlan client tkip < wlan client tkip
< wlan client tls cipher
< wlan client tls version
< wlan client wpa mode < wlan client wpa mode
< wlan client wpa mode all < wlan client wpa mode all
< wlan client wpa mode ccmp ccmp < wlan client wpa mode ccmp ccmp
@@ -1229,6 +1234,8 @@
< wlan client disconnected < wlan client disconnected
< wlan client duplicate ssid < wlan client duplicate ssid
< wlan client eap authentication method < wlan client eap authentication method
< wlan client eap phase2 method
< wlan client eap state
< wlan client edit entry < wlan client edit entry
< wlan client encryption < wlan client encryption
< wlan client encryption eap < wlan client encryption eap
@@ -1240,6 +1247,7 @@
< wlan client group key algorithm < wlan client group key algorithm
< wlan client identity < wlan client identity
< wlan client invalid key length < wlan client invalid key length
< wlan client method
< wlan client new entry < wlan client new entry
< wlan client new network < wlan client new network
< wlan client pairwise cipher < wlan client pairwise cipher
@@ -1250,6 +1258,8 @@
< wlan clients < wlan clients
< wlan client ssid < wlan client ssid
< wlan client tkip < wlan client tkip
< wlan client tls cipher
< wlan client tls version
< wlan client wpa mode < wlan client wpa mode
< wlan client wpa mode all < wlan client wpa mode all
< wlan client wpa mode ccmp ccmp < wlan client wpa mode ccmp ccmp
@@ -1831,6 +1841,8 @@
< wlan client disconnected < wlan client disconnected
< wlan client duplicate ssid < wlan client duplicate ssid
< wlan client eap authentication method < wlan client eap authentication method
< wlan client eap phase2 method
< wlan client eap state
< wlan client edit entry < wlan client edit entry
< wlan client encryption < wlan client encryption
< wlan client encryption eap < wlan client encryption eap
@@ -1842,6 +1854,7 @@
< wlan client group key algorithm < wlan client group key algorithm
< wlan client identity < wlan client identity
< wlan client invalid key length < wlan client invalid key length
< wlan client method
< wlan client new entry < wlan client new entry
< wlan client new network < wlan client new network
< wlan client pairwise cipher < wlan client pairwise cipher
@@ -1852,6 +1865,8 @@
< wlan clients < wlan clients
< wlan client ssid < wlan client ssid
< wlan client tkip < wlan client tkip
< wlan client tls cipher
< wlan client tls version
< wlan client wpa mode < wlan client wpa mode
< wlan client wpa mode all < wlan client wpa mode all
< wlan client wpa mode ccmp ccmp < wlan client wpa mode ccmp ccmp
@@ -2439,6 +2454,8 @@
< wlan client disconnected < wlan client disconnected
< wlan client duplicate ssid < wlan client duplicate ssid
< wlan client eap authentication method < wlan client eap authentication method
< wlan client eap phase2 method
< wlan client eap state
< wlan client edit entry < wlan client edit entry
< wlan client encryption < wlan client encryption
< wlan client encryption eap < wlan client encryption eap
@@ -2450,6 +2467,7 @@
< wlan client group key algorithm < wlan client group key algorithm
< wlan client identity < wlan client identity
< wlan client invalid key length < wlan client invalid key length
< wlan client method
< wlan client new entry < wlan client new entry
< wlan client new network < wlan client new network
< wlan client pairwise cipher < wlan client pairwise cipher
@@ -2460,6 +2478,8 @@
< wlan clients < wlan clients
< wlan client ssid < wlan client ssid
< wlan client tkip < wlan client tkip
< wlan client tls cipher
< wlan client tls version
< wlan client wpa mode < wlan client wpa mode
< wlan client wpa mode all < wlan client wpa mode all
< wlan client wpa mode ccmp ccmp < wlan client wpa mode ccmp ccmp

53
html/cgi-bin/wirelessclient.cgi
View File

@@ -680,6 +680,59 @@ sub ShowStatus() {
</tr> </tr>
END END
if ($status{'EAP state'}) {
my $selected_method = $status{'selectedMethod'};
$selected_method =~ s/\d+ \((.*)\)/$1/e;
print <<END;
<tr>
<td colspan='2'>
<strong>$Lang::tr{'wlan client encryption eap'}</strong>
</td>
</tr>
<tr>
<td width='20%'>
$Lang::tr{'wlan client eap state'}
</td>
<td width='80%'>
$status{'EAP state'}
</td>
</tr>
<tr>
<td width='20%'>
$Lang::tr{'wlan client method'}
</td>
<td width='80%'>
$selected_method
</td>
</tr>
<tr>
<td width='20%'>
$Lang::tr{'wlan client tls version'}
</td>
<td width='80%'>
$status{'eap_tls_version'}
</td>
</tr>
<tr>
<td width='20%'>
$Lang::tr{'wlan client tls cipher'}
</td>
<td width='80%'>
$status{'EAP TLS cipher'}
</td>
</tr>
<tr>
<td width='20%'>
$Lang::tr{'wlan client eap phase2 method'}
</td>
<td width='80%'>
$status{"${selected_method}v0 Phase2 method"}
</td>
</tr>
END
}
if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) { if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) {
print <<END; print <<END;
<tr> <tr>

5
langs/de/cgi-bin/de.pl
View File

@@ -2670,6 +2670,8 @@
'wlan client disconnected' => 'Nicht verbunden', 'wlan client disconnected' => 'Nicht verbunden',
'wlan client duplicate ssid' => 'Doppelte SSID', 'wlan client duplicate ssid' => 'Doppelte SSID',
'wlan client eap authentication method' => 'EAP-Authentifizierungsmethode', 'wlan client eap authentication method' => 'EAP-Authentifizierungsmethode',
'wlan client eap phase2 method' => 'EAP-Phase-2-Methode',
'wlan client eap state' => 'EAP-Status',
'wlan client edit entry' => 'Verbindung bearbeiten', 'wlan client edit entry' => 'Verbindung bearbeiten',
'wlan client encryption' => 'Verschlüsselung', 'wlan client encryption' => 'Verschlüsselung',
'wlan client encryption eap' => 'EAP', 'wlan client encryption eap' => 'EAP',
@@ -2681,6 +2683,7 @@
'wlan client group key algorithm' => 'GKA', 'wlan client group key algorithm' => 'GKA',
'wlan client identity' => 'Identität', 'wlan client identity' => 'Identität',
'wlan client invalid key length' => 'Ungültige Schlüssellänge.', 'wlan client invalid key length' => 'Ungültige Schlüssellänge.',
'wlan client method' => 'Methode',
'wlan client new entry' => 'Neue WLAN-Client-Konfiguration erstellen', 'wlan client new entry' => 'Neue WLAN-Client-Konfiguration erstellen',
'wlan client new network' => 'Neues Netzwerk', 'wlan client new network' => 'Neues Netzwerk',
'wlan client pairwise cipher' => 'Paarweise Chiffre', 'wlan client pairwise cipher' => 'Paarweise Chiffre',
@@ -2690,6 +2693,8 @@
'wlan client psk' => 'Schlüssel', 'wlan client psk' => 'Schlüssel',
'wlan client ssid' => 'SSID', 'wlan client ssid' => 'SSID',
'wlan client tkip' => 'TKIP', 'wlan client tkip' => 'TKIP',
'wlan client tls cipher' => 'TLS-Chiffre',
'wlan client tls version' => 'TLS-Version',
'wlan client wpa mode' => 'WPA-Modus', 'wlan client wpa mode' => 'WPA-Modus',
'wlan client wpa mode all' => 'Automatisch', 'wlan client wpa mode all' => 'Automatisch',
'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP',

5
langs/en/cgi-bin/en.pl
View File

@@ -2715,6 +2715,8 @@
'wlan client disconnected' => 'Disconnected', 'wlan client disconnected' => 'Disconnected',
'wlan client duplicate ssid' => 'Duplicate SSID', 'wlan client duplicate ssid' => 'Duplicate SSID',
'wlan client eap authentication method' => 'EAP Authentication Method', 'wlan client eap authentication method' => 'EAP Authentication Method',
'wlan client eap phase2 method' => 'EAP Phase 2 Method',
'wlan client eap state' => 'EAP Status',
'wlan client edit entry' => 'Edit wireless client configuration', 'wlan client edit entry' => 'Edit wireless client configuration',
'wlan client encryption' => 'Encryption', 'wlan client encryption' => 'Encryption',
'wlan client encryption eap' => 'EAP', 'wlan client encryption eap' => 'EAP',
@@ -2726,6 +2728,7 @@
'wlan client group key algorithm' => 'GKA', 'wlan client group key algorithm' => 'GKA',
'wlan client identity' => 'Identity', 'wlan client identity' => 'Identity',
'wlan client invalid key length' => 'Invalid key length.', 'wlan client invalid key length' => 'Invalid key length.',
'wlan client method' => 'Method',
'wlan client new entry' => 'Create new wireless client configuration', 'wlan client new entry' => 'Create new wireless client configuration',
'wlan client new network' => 'New network', 'wlan client new network' => 'New network',
'wlan client pairwise cipher' => 'Pairwise cipher', 'wlan client pairwise cipher' => 'Pairwise cipher',
@@ -2735,6 +2738,8 @@
'wlan client psk' => 'Pre-shared key', 'wlan client psk' => 'Pre-shared key',
'wlan client ssid' => 'SSID', 'wlan client ssid' => 'SSID',
'wlan client tkip' => 'TKIP', 'wlan client tkip' => 'TKIP',
'wlan client tls cipher' => 'TLS Cipher',
'wlan client tls version' => 'TLS Version',
'wlan client wpa mode' => 'WPA mode', 'wlan client wpa mode' => 'WPA mode',
'wlan client wpa mode all' => 'Auto', 'wlan client wpa mode all' => 'Auto',
'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP',