Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tux-mind
tux-mind committed Oct 5, 2015
2 parents 59c8b84 + 2a78949 commit 40d7e21
Show file tree
Hide file tree
Showing 34 changed files with 1,419 additions and 1,331 deletions.
5 changes: 3 additions & 2 deletions cSploit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies {
compile 'com.android.support:support-v4:23.0.1'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:design:23.0.1'
compile 'com.android.support:preference-v7:23.0.1'
compile 'org.apache.commons:commons-compress:1.10'
compile 'commons-net:commons-net:3.3'
compile 'com.github.zafarkhaja:java-semver:0.9.0'
Expand Down Expand Up @@ -51,8 +52,8 @@ android {
defaultConfig {
minSdkVersion 9
targetSdkVersion 22
versionCode 1
versionName "1.6.0-rc.2"
versionCode 2
versionName "1.6.0"
if(System.getenv("NIGHTLY_BUILD")) {
versionName += "+" + System.getenv("NIGHTLY_BUILD_COMMIT").substring(0, 7)
}
Expand Down
13 changes: 11 additions & 2 deletions cSploit/res/layout/plugin_exploit_finder_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,21 @@
android:fontFamily="sans-serif-condensed"
android:textSize="16sp"/>


<TextView
android:id="@+id/itemDescription"
android:id="@+id/itemRanking"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/itemTitle"
android:layout_toRightOf="@id/itemIcon"
android:textSize="13sp"/>
android:textSize="12sp"/>

<TextView
android:id="@+id/itemDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/itemRanking"
android:layout_toRightOf="@id/itemIcon"
android:textSize="14sp"/>

</RelativeLayout>
45 changes: 40 additions & 5 deletions cSploit/res/layout/plugin_portscanner.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
android:id="@+id/separator"
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_below="@+id/scanToggleButton"
android:background="@android:color/darker_gray"/>
android:background="@android:color/darker_gray"
android:layout_below="@+id/scanDoc"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />

<ListView
android:id="@+id/scanListView"
Expand All @@ -41,4 +43,37 @@
android:layout_alignRight="@+id/scanListView"
android:visibility="invisible"/>

</RelativeLayout>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/scanParameters"
android:layout_below="@+id/scanToggleButton"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"
android:hint="-sS -P0 --privileged --send-ip --system-dns" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="doc: https://nmap.org/book/man.html"
android:id="@+id/scanDoc"
android:layout_below="@+id/scanParameters"
android:layout_alignParentLeft="false"
android:layout_alignParentStart="true"
android:layout_alignRight="@+id/separator"
android:layout_alignEnd="@+id/separator"
android:linksClickable="true"
android:autoLink="web"
android:layout_alignParentRight="false"
android:layout_alignParentTop="false"
android:layout_alignParentBottom="false"
android:textAlignment="center"
android:gravity="center_horizontal"
android:visibility="gone" />

</RelativeLayout>
4 changes: 4 additions & 0 deletions cSploit/res/menu/port_scanner.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">

<item
android:id="@+id/scanner_custom_parameters"
android:checkable="true"
android:title="@string/scanner_custom_parameters" />
<item
android:id="@+id/select_ports"
android:title="@string/scanner_select_ports" />
Expand Down
42 changes: 21 additions & 21 deletions cSploit/res/values-ar/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<string name="net_discovery_started">Network discovery started.</string>
<string name="start_monitor">Start Network Monitor</string>
<string name="stop_monitor">Stop Network Monitor</string>
<string name="start_msfrpcd">Start MetaSploit RPCD</string>
<string name="stop_msfrpcd">Stop MetaSploit RPCD</string>
<string name="start_msfrpcd">Start Metasploit RPCD</string>
<string name="stop_msfrpcd">Stop Metasploit RPCD</string>
<string name="exit">خروج</string>
<string name="close_confirm">هذا وسوف يغلق cSploit، هل أنت متأكد من أنك تريد المتابعة؟
</string>
Expand Down Expand Up @@ -228,11 +228,11 @@
<string name="error_rpc">RPC error</string>
<string name="error_rpcd_inval">bad settings</string>
<string name="error_rpcd_shell">cannot execute shell</string>
<string name="rpcd_starting">Starting MetaSploit RPCD&#8230;</string>
<string name="rpcd_started">MetaSploit RPCD started</string>
<string name="rpcd_stopped">MetaSploit RPCD stopped</string>
<string name="rpcd_running">MetaSploit RPCD is already running</string>
<string name="rpcd_timedout">MetaSploit RPCD does not respond</string>
<string name="rpcd_starting">Starting Metasploit RPCD&#8230;</string>
<string name="rpcd_started">Metasploit RPCD started</string>
<string name="rpcd_stopped">Metasploit RPCD stopped</string>
<string name="rpcd_running">Metasploit RPCD is already running</string>
<string name="rpcd_timedout">Metasploit RPCD does not respond</string>
<string name="error_rcpd_fatal">fatal error occurred, i\'m searching that bug for send it to my developers.
if i won\'t exit please close me from preferences->applications,
and ALERT MY DEVELOPERS.
Expand Down Expand Up @@ -313,7 +313,7 @@
<!-- preferences -->
<string name="pref_general">General</string>
<string name="pref_modules">Modules</string>
<string name="pref_msf">MetaSploit Framework</string>
<string name="pref_msf">Metasploit Framework</string>
<string name="pref_performance">Performance</string>
<string name="pref_check_updates">Check for Updates</string>
<string name="pref_wake_lock">Wake Lock</string>
Expand Down Expand Up @@ -342,20 +342,20 @@
<string name="pref_msf_check_updates">Check for MSF updates</string>
<string name="pref_msf_check_updates_desc">Check for MSF updates every time the application is started.</string>
<string name="pref_rpc_user">RPC username</string>
<string name="pref_rpc_user_desc">Username for connect to MetaSploit RPCD.</string>
<string name="pref_rpc_user_desc">Username for connect to Metasploit RPCD.</string>
<string name="pref_rpc_pswd">RPC password</string>
<string name="pref_rpc_pswd_desc">Password for connect to MetaSploit RPCD.</string>
<string name="pref_rpc_pswd_desc">Password for connect to Metasploit RPCD.</string>
<string name="pref_rpc_host">RPC host</string>
<string name="pref_rpc_host_desc">host where the MetaSploit RPC server is on</string>
<string name="pref_rpc_host_desc">host where the Metasploit RPC server is on</string>
<string name="pref_rpc_port">RPC port</string>
<string name="pref_rpc_port_desc">Port for connect to MetaSploit RPCD.</string>
<string name="pref_rpc_port_desc">Port for connect to Metasploit RPCD.</string>
<string name="pref_rpc_ssl">RPC use SSL</string>
<string name="pref_rpc_ssl_desc">Specify if MetaSploit RPC use SSL</string>
<string name="pref_rpc_ssl_desc">Specify if Metasploit RPC use SSL</string>
<string name="pref_msfdir">MSF directory</string>
<string name="pref_msfdir_desc">Directory containing the MetaSploit Framework.</string>
<string name="pref_msfdir_desc">Directory containing the Metasploit Framework.</string>
<string name="pref_rubydir">Ruby directory</string>
<string name="pref_rubydir_desc">Directory containing the Ruby interpreter.</string>
<string name="pref_msf_branch_desc">The MetaSploit Framework branch to use</string>
<string name="pref_msf_branch_desc">The Metasploit Framework branch to use</string>
<string name="pref_msf_branch_title">MSF branch</string>
<string name="pref_performance_vuln_title">Search preferences</string>
<string name="pref_performance_vuln_desc">Search for vulnerability using</string>
Expand Down Expand Up @@ -385,10 +385,10 @@
<string name="pref_advanced">Advanced</string>
<string name="pref_folder">Folder</string>
<string name="pref_msf_enable">Enable MSF</string>
<string name="pref_msf_enable_desc">Enable the MetaSploit Framework</string>
<string name="pref_msf_enable_desc">Enable the Metasploit Framework</string>
<string name="pref_msf_delete">Delete MSF</string>
<string name="pref_msf_delete_desc">Delete the MetaSploit Framework from your device</string>
<string name="pref_msfwipe_message">Do you really want to delete the MetaSploit Framework?</string>
<string name="pref_msf_delete_desc">Delete the Metasploit Framework from your device</string>
<string name="pref_msfwipe_message">Do you really want to delete the Metasploit Framework?</string>
<string name="pref_msfwipe_size">About %d MB will be freed.</string>
<string name="pref_err_exists">does not exists.</string>
<string name="pref_err_writable">is not writable.</string>
Expand Down Expand Up @@ -446,9 +446,9 @@
<string name="target_selected">target selected</string>
<string name="targets_selected">targets selected</string>
<string name="multiple_attack">multiple attack</string>
<string name="connect_msf">connect to MetaSploit</string>
<string name="disconnect_msf">disconnect from MetaSploit</string>
<string name="connected_msf">connected to MetaSploit</string>
<string name="connect_msf">connect to Metasploit</string>
<string name="disconnect_msf">disconnect from Metasploit</string>
<string name="connected_msf">connected to Metasploit</string>
<string name="connection_failed">connection FAILED!</string>
<string name="new_ruby_update_desc">An update for ruby is available</string>
<string name="delete_previous_location">Delete previous location?</string>
Expand Down
38 changes: 19 additions & 19 deletions cSploit/res/values-cs/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
<string name="net_discovery_started">Průzkum sítě aktivován</string>
<string name="start_monitor">Spustit průzkum sítě</string>
<string name="stop_monitor">Ukončit průzkum sítě</string>
<string name="start_msfrpcd">Spustit MetaSploit RPCD</string>
<string name="stop_msfrpcd">Ukončit MetaSploit RPCD</string>
<string name="start_msfrpcd">Spustit Metasploit RPCD</string>
<string name="stop_msfrpcd">Ukončit Metasploit RPCD</string>
<string name="exit">Exit</string>
<string name="close_confirm">Opravdu zavřít?
</string>
Expand Down Expand Up @@ -226,11 +226,11 @@
<string name="error_rpc">Chyba RPC</string>
<string name="error_rpcd_inval">špatné nastavení</string>
<string name="error_rpcd_shell">nemohu spustit shell</string>
<string name="rpcd_starting">Spouštím MetaSploit RPCD&#8230;</string>
<string name="rpcd_started">MetaSploit RPCD spuštěn</string>
<string name="rpcd_stopped">MetaSploit RPCD vypnut</string>
<string name="rpcd_running">MetaSploit RPCD již běží</string>
<string name="rpcd_timedout">MetaSploit RPCD neodpovídá</string>
<string name="rpcd_starting">Spouštím Metasploit RPCD&#8230;</string>
<string name="rpcd_started">Metasploit RPCD spuštěn</string>
<string name="rpcd_stopped">Metasploit RPCD vypnut</string>
<string name="rpcd_running">Metasploit RPCD již běží</string>
<string name="rpcd_timedout">Metasploit RPCD neodpovídá</string>
<string name="error_rcpd_fatal">fatální chyba, hledám chybu pro poslání logu vývojářovi
pokud se nevypnu, vypněte mě z Nastavení->Aplikace,
a DEJTE VĚDĚT MÉMU VÝVOJÁŘI.
Expand Down Expand Up @@ -311,7 +311,7 @@
<!-- nastaveni -->
<string name="pref_general">Hlavní</string>
<string name="pref_modules">Moduly</string>
<string name="pref_msf">MetaSploitFramework</string>
<string name="pref_msf">MetasploitFramework</string>
<string name="pref_performance">Výkon</string>
<string name="pref_check_updates">Zkontrolovat aktualizace</string>
<string name="pref_wake_lock">Zabránit uspání</string>
Expand Down Expand Up @@ -340,20 +340,20 @@
<string name="pref_msf_check_updates">Aktualizovat MSF</string>
<string name="pref_msf_check_updates_desc">Zkontrolovat dostupnost aktualizací pro MSF při každém spuštění aplikace</string>
<string name="pref_rpc_user">RPC uživatelské jméno</string>
<string name="pref_rpc_user_desc">Uživatelské jméno pro připojení k MetaSploit RPCD.</string>
<string name="pref_rpc_user_desc">Uživatelské jméno pro připojení k Metasploit RPCD.</string>
<string name="pref_rpc_pswd">RPC heslo</string>
<string name="pref_rpc_pswd_desc">Heslo pro připojení k MetaSploit RPCD.</string>
<string name="pref_rpc_pswd_desc">Heslo pro připojení k Metasploit RPCD.</string>
<string name="pref_rpc_host">RPC hostitel</string>
<string name="pref_rpc_host_desc">hostitel, na kterém běží Metasploit RPC server</string>
<string name="pref_rpc_port">RPC port</string>
<string name="pref_rpc_port_desc">Port pro připojení k MetaSploit RPCD.</string>
<string name="pref_rpc_port_desc">Port pro připojení k Metasploit RPCD.</string>
<string name="pref_rpc_ssl">RPC používá SSL</string>
<string name="pref_rpc_ssl_desc">Určit, zda bude Metasploit RPC používat SSL</string>
<string name="pref_msfdir">Složka s MSF</string>
<string name="pref_msfdir_desc">Adresář s uloženým MetaSploit Framework.</string>
<string name="pref_msfdir_desc">Adresář s uloženým Metasploit Framework.</string>
<string name="pref_rubydir">Složka s Ruby</string>
<string name="pref_rubydir_desc">Adresář s uloženým Ruby interpreter.</string>
<string name="pref_msf_branch_desc">Používané odvětví MetaSploit Framework</string>
<string name="pref_msf_branch_desc">Používané odvětví Metasploit Framework</string>
<string name="pref_msf_branch_title">MSF větev</string>
<string name="pref_performance_vuln_title">Preference vyhledávání</string>
<string name="pref_performance_vuln_desc">Hledání využití zranitelnosti</string>
Expand Down Expand Up @@ -383,10 +383,10 @@
<string name="pref_advanced">Advanced</string>
<string name="pref_folder">Složka</string>
<string name="pref_msf_enable">Povolit MSF</string>
<string name="pref_msf_enable_desc">Povolit the MetaSploit Framework</string>
<string name="pref_msf_enable_desc">Povolit the Metasploit Framework</string>
<string name="pref_msf_delete">Odtranit MSF</string>
<string name="pref_msf_delete_desc">Odstranit MetaSploit Framework z vašeho zařízení</string>
<string name="pref_msfwipe_message">Přejete si skutečně odstranit MetaSploit Framework?</string>
<string name="pref_msf_delete_desc">Odstranit Metasploit Framework z vašeho zařízení</string>
<string name="pref_msfwipe_message">Přejete si skutečně odstranit Metasploit Framework?</string>
<string name="pref_msfwipe_size">Bude uvolněno asi %d MB.</string>
<string name="pref_err_exists">neexistuje.</string>
<string name="pref_err_writable">nelze zapisovat</string>
Expand Down Expand Up @@ -443,9 +443,9 @@
<string name="target_selected">cíl byl zvolen</string>
<string name="targets_selected">cíle byly vybrány</string>
<string name="multiple_attack">kombinovaný útok</string>
<string name="connect_msf">připojit k MetaSploitu</string>
<string name="disconnect_msf">odpojit se od MetaSploitu</string>
<string name="connected_msf">připojeno MetaSploitu</string>
<string name="connect_msf">připojit k Metasploitu</string>
<string name="disconnect_msf">odpojit se od Metasploitu</string>
<string name="connected_msf">připojeno Metasploitu</string>
<string name="connection_failed">připojení SELHALO!</string>
<string name="new_ruby_update_desc">Je dostupná aktualizace pro Ruby</string>
<string name="delete_previous_location">Vyčistit minulou polohu?</string>
Expand Down
Loading

0 comments on commit 40d7e21

Please sign in to comment.