diff --git a/web/scanEngine/templates/scanEngine/wordlist/index.html b/web/scanEngine/templates/scanEngine/wordlist/index.html index 33d4444b..c3877b36 100644 --- a/web/scanEngine/templates/scanEngine/wordlist/index.html +++ b/web/scanEngine/templates/scanEngine/wordlist/index.html @@ -6,16 +6,9 @@ Wordlist {% endblock title %} {% block custom_js_css_link %} - - - - - - - - - - + + + {% endblock custom_js_css_link %} {% block breadcrumb_title %} @@ -23,21 +16,30 @@ Wordlist
  • All Worldlists
    • {% endblock breadcrumb_title %} +{% block page_title %} +Add New Wordlist +{% endblock page_title %} + {% block main_content %} -
    -
    -
    -
    -

    Wordlist

    -
    -
    - Add New Wordlist +
    +
    +
    +
    +
    +
    +
    +
    + Add New Wordlist +
    +
    -
    -
    - + +
    +
    +
    +
    @@ -53,8 +55,8 @@ Wordlist
    Wordlist Name{{ wordlist.short_name }} {{ wordlist.count }} - - + + @@ -72,28 +74,30 @@ Wordlist {% block page_level_script %} - - - - + + + {% endblock page_level_script %} diff --git a/web/scanEngine/views.py b/web/scanEngine/views.py index 19a98e5f..5312de27 100644 --- a/web/scanEngine/views.py +++ b/web/scanEngine/views.py @@ -121,13 +121,16 @@ def add_wordlist(request): def delete_wordlist(request, id): obj = get_object_or_404(Wordlist, id=id) if request.method == "POST": - os.remove( - settings.TOOL_LOCATION + + obj.delete() + try: + os.remove( + '/usr/src/' + 'wordlist/' + obj.short_name + '.txt') - obj.delete() - responseData = {'status': 'true'} + responseData = {'status': True} + except Exception as e: + responseData = {'status': False} messages.add_message( request, messages.INFO, @@ -141,66 +144,6 @@ def delete_wordlist(request, id): return http.JsonResponse(responseData) -def configuration_list(request): - configurations = Configuration.objects.all().order_by('id') - context = { - 'configuration_nav_active': - 'true', 'configurations': configurations} - return render(request, 'scanEngine/configuration/index.html', context) - - -def add_configuration(request): - context = {'configuration_nav_active': 'true'} - form = ConfigurationForm(request.POST or None) - if request.method == "POST": - if form.is_valid(): - form.save() - messages.add_message( - request, - messages.INFO, - 'Configuration added successfully') - return http.HttpResponseRedirect(reverse('configuration_list')) - context['form'] = form - return render(request, 'scanEngine/configuration/add.html', context) - - -def delete_configuration(request, id): - obj = get_object_or_404(Configuration, id=id) - if request.method == "POST": - obj.delete() - responseData = {'status': 'true'} - messages.add_message( - request, - messages.INFO, - 'Configuration successfully deleted!') - else: - responseData = {'status': 'false'} - messages.add_message( - request, - messages.ERROR, - 'Oops! Configuration could not be deleted!') - return http.JsonResponse(responseData) - - -def update_configuration(request, id): - configuration = get_object_or_404(Configuration, id=id) - form = ConfigurationForm() - if request.method == "POST": - form = ConfigurationForm(request.POST, instance=configuration) - if form.is_valid(): - form.save() - messages.add_message( - request, - messages.INFO, - 'Configuration edited successfully') - return http.HttpResponseRedirect(reverse('configuration_list')) - else: - form.set_value(configuration) - context = { - 'configuration_nav_active': - 'true', 'form': form} - return render(request, 'scanEngine/configuration/update.html', context) - def interesting_lookup(request): lookup_keywords = None context = {} diff --git a/web/targetApp/templates/organization/list.html b/web/targetApp/templates/organization/list.html index 784f65ea..d751f9c6 100644 --- a/web/targetApp/templates/organization/list.html +++ b/web/targetApp/templates/organization/list.html @@ -29,7 +29,7 @@ Organizations
    - Add New Organization + Add New Organization