Skip to content

Commit 40d7e21

Browse files
tux-mindtux-mind
committed
Merge branch 'release'
2 parents 59c8b84 + 2a78949 commit 40d7e21

34 files changed

+1419
-1331
lines changed

‎cSploit/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
compile 'com.android.support:support-v4:23.0.1'
2525
compile 'com.android.support:appcompat-v7:23.0.1'
2626
compile 'com.android.support:design:23.0.1'
27+
compile 'com.android.support:preference-v7:23.0.1'
2728
compile 'org.apache.commons:commons-compress:1.10'
2829
compile 'commons-net:commons-net:3.3'
2930
compile 'com.github.zafarkhaja:java-semver:0.9.0'
@@ -51,8 +52,8 @@ android {
5152
defaultConfig {
5253
minSdkVersion 9
5354
targetSdkVersion 22
54-
versionCode 1
55-
versionName "1.6.0-rc.2"
55+
versionCode 2
56+
versionName "1.6.0"
5657
if(System.getenv("NIGHTLY_BUILD")) {
5758
versionName += "+" + System.getenv("NIGHTLY_BUILD_COMMIT").substring(0, 7)
5859
}

‎cSploit/res/layout/plugin_exploit_finder_item.xml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,21 @@
2424
android:fontFamily="sans-serif-condensed"
2525
android:textSize="16sp"/>
2626

27+
2728
<TextView
28-
android:id="@+id/itemDescription"
29+
android:id="@+id/itemRanking"
2930
android:layout_width="match_parent"
3031
android:layout_height="wrap_content"
3132
android:layout_below="@id/itemTitle"
3233
android:layout_toRightOf="@id/itemIcon"
33-
android:textSize="13sp"/>
34+
android:textSize="12sp"/>
35+
36+
<TextView
37+
android:id="@+id/itemDescription"
38+
android:layout_width="match_parent"
39+
android:layout_height="wrap_content"
40+
android:layout_below="@id/itemRanking"
41+
android:layout_toRightOf="@id/itemIcon"
42+
android:textSize="14sp"/>
3443

3544
</RelativeLayout>

‎cSploit/res/layout/plugin_portscanner.xml

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
android:id="@+id/separator"
2222
android:layout_width="fill_parent"
2323
android:layout_height="1dp"
24-
android:layout_marginTop="8dp"
25-
android:layout_marginBottom="8dp"
26-
android:layout_below="@+id/scanToggleButton"
27-
android:background="@android:color/darker_gray"/>
24+
android:background="@android:color/darker_gray"
25+
android:layout_below="@+id/scanDoc"
26+
android:layout_marginBottom="8dp"
27+
android:layout_marginTop="8dp"
28+
android:layout_alignParentRight="true"
29+
android:layout_alignParentEnd="true" />
2830

2931
<ListView
3032
android:id="@+id/scanListView"
@@ -41,4 +43,37 @@
4143
android:layout_alignRight="@+id/scanListView"
4244
android:visibility="invisible"/>
4345

44-
</RelativeLayout>
46+
<EditText
47+
android:layout_width="wrap_content"
48+
android:layout_height="wrap_content"
49+
android:id="@+id/scanParameters"
50+
android:layout_below="@+id/scanToggleButton"
51+
android:layout_alignParentRight="true"
52+
android:layout_alignParentEnd="true"
53+
android:layout_alignParentLeft="true"
54+
android:layout_alignParentStart="true"
55+
android:textAppearance="?android:attr/textAppearanceSmall"
56+
android:visibility="gone"
57+
android:hint="-sS -P0 --privileged --send-ip --system-dns" />
58+
59+
<TextView
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content"
62+
android:textAppearance="?android:attr/textAppearanceSmall"
63+
android:text="doc: https://nmap.org/book/man.html"
64+
android:id="@+id/scanDoc"
65+
android:layout_below="@+id/scanParameters"
66+
android:layout_alignParentLeft="false"
67+
android:layout_alignParentStart="true"
68+
android:layout_alignRight="@+id/separator"
69+
android:layout_alignEnd="@+id/separator"
70+
android:linksClickable="true"
71+
android:autoLink="web"
72+
android:layout_alignParentRight="false"
73+
android:layout_alignParentTop="false"
74+
android:layout_alignParentBottom="false"
75+
android:textAlignment="center"
76+
android:gravity="center_horizontal"
77+
android:visibility="gone" />
78+
79+
</RelativeLayout>

‎cSploit/res/menu/port_scanner.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android">
33

4+
<item
5+
android:id="@+id/scanner_custom_parameters"
6+
android:checkable="true"
7+
android:title="@string/scanner_custom_parameters" />
48
<item
59
android:id="@+id/select_ports"
610
android:title="@string/scanner_select_ports" />

‎cSploit/res/values-ar/strings.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
<string name="net_discovery_started">Network discovery started.</string>
7474
<string name="start_monitor">Start Network Monitor</string>
7575
<string name="stop_monitor">Stop Network Monitor</string>
76-
<string name="start_msfrpcd">Start MetaSploit RPCD</string>
77-
<string name="stop_msfrpcd">Stop MetaSploit RPCD</string>
76+
<string name="start_msfrpcd">Start Metasploit RPCD</string>
77+
<string name="stop_msfrpcd">Stop Metasploit RPCD</string>
7878
<string name="exit">خروج</string>
7979
<string name="close_confirm">هذا وسوف يغلق cSploit، هل أنت متأكد من أنك تريد المتابعة؟
8080
</string>
@@ -228,11 +228,11 @@
228228
<string name="error_rpc">RPC error</string>
229229
<string name="error_rpcd_inval">bad settings</string>
230230
<string name="error_rpcd_shell">cannot execute shell</string>
231-
<string name="rpcd_starting">Starting MetaSploit RPCD&#8230;</string>
232-
<string name="rpcd_started">MetaSploit RPCD started</string>
233-
<string name="rpcd_stopped">MetaSploit RPCD stopped</string>
234-
<string name="rpcd_running">MetaSploit RPCD is already running</string>
235-
<string name="rpcd_timedout">MetaSploit RPCD does not respond</string>
231+
<string name="rpcd_starting">Starting Metasploit RPCD&#8230;</string>
232+
<string name="rpcd_started">Metasploit RPCD started</string>
233+
<string name="rpcd_stopped">Metasploit RPCD stopped</string>
234+
<string name="rpcd_running">Metasploit RPCD is already running</string>
235+
<string name="rpcd_timedout">Metasploit RPCD does not respond</string>
236236
<string name="error_rcpd_fatal">fatal error occurred, i\'m searching that bug for send it to my developers.
237237
if i won\'t exit please close me from preferences->applications,
238238
and ALERT MY DEVELOPERS.
@@ -313,7 +313,7 @@
313313
<!-- preferences -->
314314
<string name="pref_general">General</string>
315315
<string name="pref_modules">Modules</string>
316-
<string name="pref_msf">MetaSploit Framework</string>
316+
<string name="pref_msf">Metasploit Framework</string>
317317
<string name="pref_performance">Performance</string>
318318
<string name="pref_check_updates">Check for Updates</string>
319319
<string name="pref_wake_lock">Wake Lock</string>
@@ -342,20 +342,20 @@
342342
<string name="pref_msf_check_updates">Check for MSF updates</string>
343343
<string name="pref_msf_check_updates_desc">Check for MSF updates every time the application is started.</string>
344344
<string name="pref_rpc_user">RPC username</string>
345-
<string name="pref_rpc_user_desc">Username for connect to MetaSploit RPCD.</string>
345+
<string name="pref_rpc_user_desc">Username for connect to Metasploit RPCD.</string>
346346
<string name="pref_rpc_pswd">RPC password</string>
347-
<string name="pref_rpc_pswd_desc">Password for connect to MetaSploit RPCD.</string>
347+
<string name="pref_rpc_pswd_desc">Password for connect to Metasploit RPCD.</string>
348348
<string name="pref_rpc_host">RPC host</string>
349-
<string name="pref_rpc_host_desc">host where the MetaSploit RPC server is on</string>
349+
<string name="pref_rpc_host_desc">host where the Metasploit RPC server is on</string>
350350
<string name="pref_rpc_port">RPC port</string>
351-
<string name="pref_rpc_port_desc">Port for connect to MetaSploit RPCD.</string>
351+
<string name="pref_rpc_port_desc">Port for connect to Metasploit RPCD.</string>
352352
<string name="pref_rpc_ssl">RPC use SSL</string>
353-
<string name="pref_rpc_ssl_desc">Specify if MetaSploit RPC use SSL</string>
353+
<string name="pref_rpc_ssl_desc">Specify if Metasploit RPC use SSL</string>
354354
<string name="pref_msfdir">MSF directory</string>
355-
<string name="pref_msfdir_desc">Directory containing the MetaSploit Framework.</string>
355+
<string name="pref_msfdir_desc">Directory containing the Metasploit Framework.</string>
356356
<string name="pref_rubydir">Ruby directory</string>
357357
<string name="pref_rubydir_desc">Directory containing the Ruby interpreter.</string>
358-
<string name="pref_msf_branch_desc">The MetaSploit Framework branch to use</string>
358+
<string name="pref_msf_branch_desc">The Metasploit Framework branch to use</string>
359359
<string name="pref_msf_branch_title">MSF branch</string>
360360
<string name="pref_performance_vuln_title">Search preferences</string>
361361
<string name="pref_performance_vuln_desc">Search for vulnerability using</string>
@@ -385,10 +385,10 @@
385385
<string name="pref_advanced">Advanced</string>
386386
<string name="pref_folder">Folder</string>
387387
<string name="pref_msf_enable">Enable MSF</string>
388-
<string name="pref_msf_enable_desc">Enable the MetaSploit Framework</string>
388+
<string name="pref_msf_enable_desc">Enable the Metasploit Framework</string>
389389
<string name="pref_msf_delete">Delete MSF</string>
390-
<string name="pref_msf_delete_desc">Delete the MetaSploit Framework from your device</string>
391-
<string name="pref_msfwipe_message">Do you really want to delete the MetaSploit Framework?</string>
390+
<string name="pref_msf_delete_desc">Delete the Metasploit Framework from your device</string>
391+
<string name="pref_msfwipe_message">Do you really want to delete the Metasploit Framework?</string>
392392
<string name="pref_msfwipe_size">About %d MB will be freed.</string>
393393
<string name="pref_err_exists">does not exists.</string>
394394
<string name="pref_err_writable">is not writable.</string>
@@ -446,9 +446,9 @@
446446
<string name="target_selected">target selected</string>
447447
<string name="targets_selected">targets selected</string>
448448
<string name="multiple_attack">multiple attack</string>
449-
<string name="connect_msf">connect to MetaSploit</string>
450-
<string name="disconnect_msf">disconnect from MetaSploit</string>
451-
<string name="connected_msf">connected to MetaSploit</string>
449+
<string name="connect_msf">connect to Metasploit</string>
450+
<string name="disconnect_msf">disconnect from Metasploit</string>
451+
<string name="connected_msf">connected to Metasploit</string>
452452
<string name="connection_failed">connection FAILED!</string>
453453
<string name="new_ruby_update_desc">An update for ruby is available</string>
454454
<string name="delete_previous_location">Delete previous location?</string>

‎cSploit/res/values-cs/strings.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<string name="net_discovery_started">Průzkum sítě aktivován</string>
7676
<string name="start_monitor">Spustit průzkum sítě</string>
7777
<string name="stop_monitor">Ukončit průzkum sítě</string>
78-
<string name="start_msfrpcd">Spustit MetaSploit RPCD</string>
79-
<string name="stop_msfrpcd">Ukončit MetaSploit RPCD</string>
78+
<string name="start_msfrpcd">Spustit Metasploit RPCD</string>
79+
<string name="stop_msfrpcd">Ukončit Metasploit RPCD</string>
8080
<string name="exit">Exit</string>
8181
<string name="close_confirm">Opravdu zavřít?
8282
</string>
@@ -226,11 +226,11 @@
226226
<string name="error_rpc">Chyba RPC</string>
227227
<string name="error_rpcd_inval">špatné nastavení</string>
228228
<string name="error_rpcd_shell">nemohu spustit shell</string>
229-
<string name="rpcd_starting">Spouštím MetaSploit RPCD&#8230;</string>
230-
<string name="rpcd_started">MetaSploit RPCD spuštěn</string>
231-
<string name="rpcd_stopped">MetaSploit RPCD vypnut</string>
232-
<string name="rpcd_running">MetaSploit RPCD již běží</string>
233-
<string name="rpcd_timedout">MetaSploit RPCD neodpovídá</string>
229+
<string name="rpcd_starting">Spouštím Metasploit RPCD&#8230;</string>
230+
<string name="rpcd_started">Metasploit RPCD spuštěn</string>
231+
<string name="rpcd_stopped">Metasploit RPCD vypnut</string>
232+
<string name="rpcd_running">Metasploit RPCD již běží</string>
233+
<string name="rpcd_timedout">Metasploit RPCD neodpovídá</string>
234234
<string name="error_rcpd_fatal">fatální chyba, hledám chybu pro poslání logu vývojářovi
235235
pokud se nevypnu, vypněte mě z Nastavení->Aplikace,
236236
a DEJTE VĚDĚT MÉMU VÝVOJÁŘI.
@@ -311,7 +311,7 @@
311311
<!-- nastaveni -->
312312
<string name="pref_general">Hlavní</string>
313313
<string name="pref_modules">Moduly</string>
314-
<string name="pref_msf">MetaSploitFramework</string>
314+
<string name="pref_msf">MetasploitFramework</string>
315315
<string name="pref_performance">Výkon</string>
316316
<string name="pref_check_updates">Zkontrolovat aktualizace</string>
317317
<string name="pref_wake_lock">Zabránit uspání</string>
@@ -340,20 +340,20 @@
340340
<string name="pref_msf_check_updates">Aktualizovat MSF</string>
341341
<string name="pref_msf_check_updates_desc">Zkontrolovat dostupnost aktualizací pro MSF při každém spuštění aplikace</string>
342342
<string name="pref_rpc_user">RPC uživatelské jméno</string>
343-
<string name="pref_rpc_user_desc">Uživatelské jméno pro připojení k MetaSploit RPCD.</string>
343+
<string name="pref_rpc_user_desc">Uživatelské jméno pro připojení k Metasploit RPCD.</string>
344344
<string name="pref_rpc_pswd">RPC heslo</string>
345-
<string name="pref_rpc_pswd_desc">Heslo pro připojení k MetaSploit RPCD.</string>
345+
<string name="pref_rpc_pswd_desc">Heslo pro připojení k Metasploit RPCD.</string>
346346
<string name="pref_rpc_host">RPC hostitel</string>
347347
<string name="pref_rpc_host_desc">hostitel, na kterém běží Metasploit RPC server</string>
348348
<string name="pref_rpc_port">RPC port</string>
349-
<string name="pref_rpc_port_desc">Port pro připojení k MetaSploit RPCD.</string>
349+
<string name="pref_rpc_port_desc">Port pro připojení k Metasploit RPCD.</string>
350350
<string name="pref_rpc_ssl">RPC používá SSL</string>
351351
<string name="pref_rpc_ssl_desc">Určit, zda bude Metasploit RPC používat SSL</string>
352352
<string name="pref_msfdir">Složka s MSF</string>
353-
<string name="pref_msfdir_desc">Adresář s uloženým MetaSploit Framework.</string>
353+
<string name="pref_msfdir_desc">Adresář s uloženým Metasploit Framework.</string>
354354
<string name="pref_rubydir">Složka s Ruby</string>
355355
<string name="pref_rubydir_desc">Adresář s uloženým Ruby interpreter.</string>
356-
<string name="pref_msf_branch_desc">Používané odvětví MetaSploit Framework</string>
356+
<string name="pref_msf_branch_desc">Používané odvětví Metasploit Framework</string>
357357
<string name="pref_msf_branch_title">MSF větev</string>
358358
<string name="pref_performance_vuln_title">Preference vyhledávání</string>
359359
<string name="pref_performance_vuln_desc">Hledání využití zranitelnosti</string>
@@ -383,10 +383,10 @@
383383
<string name="pref_advanced">Advanced</string>
384384
<string name="pref_folder">Složka</string>
385385
<string name="pref_msf_enable">Povolit MSF</string>
386-
<string name="pref_msf_enable_desc">Povolit the MetaSploit Framework</string>
386+
<string name="pref_msf_enable_desc">Povolit the Metasploit Framework</string>
387387
<string name="pref_msf_delete">Odtranit MSF</string>
388-
<string name="pref_msf_delete_desc">Odstranit MetaSploit Framework z vašeho zařízení</string>
389-
<string name="pref_msfwipe_message">Přejete si skutečně odstranit MetaSploit Framework?</string>
388+
<string name="pref_msf_delete_desc">Odstranit Metasploit Framework z vašeho zařízení</string>
389+
<string name="pref_msfwipe_message">Přejete si skutečně odstranit Metasploit Framework?</string>
390390
<string name="pref_msfwipe_size">Bude uvolněno asi %d MB.</string>
391391
<string name="pref_err_exists">neexistuje.</string>
392392
<string name="pref_err_writable">nelze zapisovat</string>
@@ -443,9 +443,9 @@
443443
<string name="target_selected">cíl byl zvolen</string>
444444
<string name="targets_selected">cíle byly vybrány</string>
445445
<string name="multiple_attack">kombinovaný útok</string>
446-
<string name="connect_msf">připojit k MetaSploitu</string>
447-
<string name="disconnect_msf">odpojit se od MetaSploitu</string>
448-
<string name="connected_msf">připojeno MetaSploitu</string>
446+
<string name="connect_msf">připojit k Metasploitu</string>
447+
<string name="disconnect_msf">odpojit se od Metasploitu</string>
448+
<string name="connected_msf">připojeno Metasploitu</string>
449449
<string name="connection_failed">připojení SELHALO!</string>
450450
<string name="new_ruby_update_desc">Je dostupná aktualizace pro Ruby</string>
451451
<string name="delete_previous_location">Vyčistit minulou polohu?</string>

0 commit comments

Comments
 (0)