diff --git a/mobsf/MobSF/init.py b/mobsf/MobSF/init.py index 695a881bc9..ff4cc570f4 100644 --- a/mobsf/MobSF/init.py +++ b/mobsf/MobSF/init.py @@ -10,7 +10,7 @@ logger = logging.getLogger(__name__) -VERSION = '3.6.0' +VERSION = '3.6.1' BANNER = """ __ __ _ ____ _____ _____ __ | \/ | ___ | |__/ ___|| ___|_ _|___ / / /_ diff --git a/mobsf/MobSF/urls.py b/mobsf/MobSF/urls.py index 2327055dae..2a595f31be 100755 --- a/mobsf/MobSF/urls.py +++ b/mobsf/MobSF/urls.py @@ -82,6 +82,7 @@ re_path(r'^download/', home.download), re_path(r'^download_scan/', home.download_apk), re_path(r'^about$', home.about, name='about'), + re_path(r'^donate$', home.donate, name='donate'), re_path(r'^api_docs$', home.api_docs, name='api_docs'), re_path(r'^recent_scans/$', home.recent_scans, name='recent'), re_path(r'^delete_scan/$', home.delete_scan), diff --git a/mobsf/MobSF/views/home.py b/mobsf/MobSF/views/home.py index 84ccd77199..9ecce1ea0f 100755 --- a/mobsf/MobSF/views/home.py +++ b/mobsf/MobSF/views/home.py @@ -166,6 +166,16 @@ def about(request): return render(request, template, context) +def donate(request): + """Donate Route.""" + context = { + 'title': 'Donate', + 'version': settings.MOBSF_VER, + } + template = 'general/donate.html' + return render(request, template, context) + + def error(request): """Error Route.""" context = { diff --git a/mobsf/static/landing/css/home.css b/mobsf/static/landing/css/home.css index 2e9f538bda..2431c97e05 100644 --- a/mobsf/static/landing/css/home.css +++ b/mobsf/static/landing/css/home.css @@ -213,64 +213,20 @@ div#textnode { transition: font-size 175ms; } /* TOP NAV */ -/* Add a black background color to the top navigation */ -.topnav { - overflow: hidden; - background-color: #312f2f; - position: fixed; - top: 0; - width: 100%; - z-index: 1; -} - -/* Style the links inside the navigation bar */ -.topnav a { - float: left; - color: #a7a6a6; - text-align: center; - padding: 14px 16px; - text-decoration: none; - font-size: 20px; -} - -/* Change the color of links on hover */ -.topnav a:hover { - color: #fff; -} - -/* Centered section inside the top navigation */ -.topnav-centered a { - float: none; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - z-index: 999; -} -.topnav-centered a:hover { - background-color: #312f2f; -} - -/* Right-aligned section inside the top navigation */ -.topnav-right { - float: right; -} - -/* Responsive navigation menu - display links on top of each other instead of next to each other (for mobile devices) */ -@media screen and (max-width: 600px) { - .topnav a, .topnav-right { - float: none; - display: block; +@media (min-width: 768px) { + .navbar-brand.abs + { + position: absolute; + width: auto; + left: 50%; + transform: translateX(-50%); + text-align: center; + font-size: 20px; + } } + - .topnav-centered a { - position: relative; - top: 0; - left: 0; - transform: none; - } -} /* PROGRESS BAR */ progress { diff --git a/mobsf/templates/base/base_layout.html b/mobsf/templates/base/base_layout.html index aa40a45f56..94ea285eed 100644 --- a/mobsf/templates/base/base_layout.html +++ b/mobsf/templates/base/base_layout.html @@ -41,8 +41,9 @@
  • RECENT SCANS
  • STATIC ANALYZER
  • DYNAMIC ANALYZER
    • -
  • API DOCS
    • -
  • DONATE ♥
    • +
  • REST API
    • +
  • DONATE ♥
    • +
  • DOCS
  • ABOUT
    • diff --git a/mobsf/templates/general/donate.html b/mobsf/templates/general/donate.html new file mode 100644 index 0000000000..62e56efd73 --- /dev/null +++ b/mobsf/templates/general/donate.html @@ -0,0 +1,70 @@ +{% extends "base/base_layout.html" %} + {% block sidebar_option %} + sidebar-collapse +{% endblock %} +{% block content %} +
    +
    +
    +
    +
    +
    +
    +
    +

    Donate to MobSF Project

    +

    + You're Awesome! Thank you for your support ♥ +

    +
    + +
    + +
    +
    +

    + Github Sponsors +

    +
    +
    +

    + Donate to MobSF project through Github Sponsors. Github will match the first $5000 in donations. +
    +
    + +

    +
    +
    +
    +
    +
    +
    +

    + Paypal Donations +

    +
    +
    +

    + You can also donate to MobSF project through PayPal. +
    +
    + +

    + + + + + + +
    + +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +{% endblock %} diff --git a/mobsf/templates/general/home.html b/mobsf/templates/general/home.html index 316cfc3685..43c1cf7648 100644 --- a/mobsf/templates/general/home.html +++ b/mobsf/templates/general/home.html @@ -17,30 +17,47 @@ -
    - -
    - - - -
    - - RECENT SCANS - DYNAMIC ANALYZER - - -
    - API DOCS - ABOUT - -
    - -
    -     -
    + + +
    @@ -71,7 +88,8 @@
    -
    RECENT SCANS | DYNAMIC ANALYZER | API DOCS | DONATE ♥ | ABOUT
    +
    RECENT SCANS | DYNAMIC ANALYZER | REST API | DONATE ♥ | DOCS | ABOUT

    © {% now "Y" %} Mobile Security Framework - MobSF {{ version }}

    @@ -88,8 +106,10 @@
    RECENT SCANS | + + - \ No newline at end of file + diff --git a/mobsf/templates/general/recent.html b/mobsf/templates/general/recent.html index f6f22f0843..1538b70800 100644 --- a/mobsf/templates/general/recent.html +++ b/mobsf/templates/general/recent.html @@ -53,19 +53,24 @@

    Recent Scans

    {% for e in entries %} - + {% if e.PACKAGE_NAME %}
    {{ e.APP_NAME }} {% if e.VERSION_NAME %} - {{ e.VERSION_NAME }} {% endif %}
    {{ e.PACKAGE_NAME }} -

    MobSF Scorecard

    +

    MobSF Scorecard

    +

    Static Report + {% if '.apk' == e.FILE_NAME|slice:"-4:" or '.xapk' == e.FILE_NAME|slice:"-5:" or '.apks' == e.FILE_NAME|slice:"-5:"%} + Dynamic Report + {% endif %} +

    {% else %}
    scan not completed {% endif %} {{ e.FILE_NAME }} - + {% if '.apk' == e.FILE_NAME|slice:"-4:"%} {% elif '.xapk' == e.FILE_NAME|slice:"-5:"%} {% elif '.apks' == e.FILE_NAME|slice:"-5:"%} @@ -76,14 +81,12 @@

    Recent Scans

    {{ e.MD5 }} {{ e.TIMESTAMP }} -

    Static Report -

    +

    {% if '.apk' == e.FILE_NAME|slice:"-4:" or '.xapk' == e.FILE_NAME|slice:"-5:" or '.apks' == e.FILE_NAME|slice:"-5:"%} -

    Dynamic Report -

    Diff or Compare +

    Diff or Compare

    {% endif %}

    Delete Scan