Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into ui

Browse source
This commit is contained in:
Jordan Blasenhauer 2024-04-30 17:37:58 +02:00
commit e9607f39f5
21 changed files with 120 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/push-packagecloud.yml vendored
View file

@ -42,7 +42,7 @@ jobs:
- name: Check out repository code
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Install ruby
uses: ruby/setup-ruby@70da3bbf44ac06db1b0547ce2acc9380a5270d1e # v1.175.0
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
with:
ruby-version: "3.0"
- name: Install packagecloud

2
src/bw/loading/index.html
View file

@ -346,7 +346,7 @@
This website is protected with
<a
class="underline hover:italic hover:brightness-90 transition"
href="https://github.com/bunkerity/bunkerweb"
href="https://www.bunkerweb.io/?utm_campaign=self&utm_source=bwloading"
target="_blank"
>BunkerWeb</a
>

10
src/common/core/antibot/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the antibot plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#antibot" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#antibot" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% if pre_render.get("status", False) and pre_render.get("status", False) == "ko" or "error" in pre_render.get("data", {}) or pre_render.get("data") is not mapping %} <div class="core-layout-separator"></div>
@ -112,7 +115,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-deactivated-title">Deactivated</h5>
<h5 class="core-card-deactivated-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -127,8 +130,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

10
src/common/core/backup/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the backup plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#backup-and-restore" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#backup-and-restore" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% if pre_render.get("status", False) and pre_render.get("status", False) == "ko" or "error" in pre_render.get("data", {}) or pre_render.get("data") is not mapping %} <div class="core-layout-separator"></div>
@ -61,7 +64,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -76,8 +79,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

15
src/common/core/badbehavior/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the bad behavior plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#bad-behavior" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,12 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available
<a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#bad-behavior" class="core-card-text-doc-link">
in the documentation
</a>
.
</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -121,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -136,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

10
src/common/core/blacklist/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the blacklist plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#blacklisting" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#blacklisting" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

10
src/common/core/bunkernet/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the bunkernet plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#bunkernet" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#bunkernet" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

10
src/common/core/cors/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the cors plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#cors" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#cors" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

10
src/common/core/country/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the country plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#country" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#country" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

10
src/common/core/dnsbl/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the dnsbl plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#dnsbl" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#dnsbl" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

5
src/common/core/errors/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the errors plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/settings/#errors" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -11,7 +14,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/settings/#errors" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->

10
src/common/core/greylist/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the greylist plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#greylisting" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#greylisting" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

10
src/common/core/limit/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the limit plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#limiting" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#limiting" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

2
src/common/core/misc/files/default.html
View file

@ -251,7 +251,7 @@
This website is protected with
<a
class="underline hover:italic hover:brightness-90 transition"
href="https://www.bunkerweb.io/?utm_campaign=self&utm_source=bwloading"
href="https://www.bunkerweb.io/?utm_campaign=self&utm_source=bwdefault"
target="_blank"
>BunkerWeb</a
>

10
src/common/core/misc/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the misc plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/settings/#miscellaneous" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/settings/#miscellaneous" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

10
src/common/core/redis/ui/template.html
View file

@ -1,4 +1,7 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the redis plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/settings/#redis" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +15,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/settings/#redis" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +119,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +134,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

11
src/common/core/reversescan/ui/template.html
View file

@ -1,4 +1,8 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the redis plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#reverse-scan" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +16,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#reverse-scan" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +120,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +135,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

3
src/common/core/ui/confs/default-server-http/ui.conf
View file

@ -1,6 +1,7 @@
{% if UI_HOST != "" and not has_variable(all, "USE_UI", "yes") +%}
location /setup {
etag off;
add_header Last-Modified "";
set $backendui "{{ UI_HOST }}";
proxy_pass $backendui;
proxy_set_header Host $host;
@ -20,6 +21,8 @@ location /setup {
}
location /setup/check {
etag off;
add_header Last-Modified "";
add_header 'Access-Control-Allow-Origin' '*' always;
add_header 'Access-Control-Allow-Methods' 'GET' always;
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;

11
src/common/core/whitelist/ui/template.html
View file

@ -1,4 +1,8 @@
{% extends "base.html" %}
{% set read_doc_text = 'You will find more information about the whitelist plugin <a target="_blank" href="https://docs.bunkerweb.io/' + bw_version + '/security-tuning/#whitelisting" class="core-card-text-doc-link">in the documentation</a>.' %}
{% block content %}
<input type="csrf_token"
name="csrf_token"
@ -12,7 +16,7 @@
<div class="core-card-text-container">
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p class="core-card-text-doc">More information available <a href="https://docs.bunkerweb.io/{{ bw_version }}/security-tuning/#whitelisting" class="core-card-text-doc-link">in the documentation</a>.</p>
<p class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
@ -116,7 +120,7 @@
{% else %}
<div class="core-card">
<div class="core-card-wrap">
<h5 class="core-card-title">Deactivated</h5>
<h5 class="core-card-title">Plugin deactivated</h5>
<!-- icon -->
<div role="img" class="core-card-svg-container">
<svg xmlns="http://www.w3.org/2000/svg"
@ -131,8 +135,9 @@
<!-- end icon -->
</div>
<div class="core-card-text-container">
<p data-info class="core-card-text">This plugin need to be activated to access page.</p>
<p data-info class="core-card-text">{{plugin.get('description')}}</p>
</div>
<p data-info class="core-card-text-doc">{{ read_doc_text|safe }}</p>
</div>
<!-- end info -->
{% endif %}

14
src/ui/templates/setup.html vendored
View file

@ -254,7 +254,7 @@
class="col-span-12 disabled:opacity-75 focus:valid:border-green-500 focus:invalid:border-red-500 outline-none focus:border-primary text-sm leading-5.6 ease block w-full appearance-none rounded-lg border border-solid border-gray-300 bg-white bg-clip-padding px-4 py-2 font-normal text-gray-700 transition-all placeholder:text-gray-500"
placeholder="/admin"
value="{{ random_url }}"
pattern="\/[a-zA-Z0-9\-]{1,255}$"
pattern="^\/([\/a-zA-Z0-9\-]{0,255})$"
required />
</div>
<!-- end ui url-->
@ -440,6 +440,7 @@
if (!this.urlInp.value.startsWith("/")) {
this.urlInp.value = "/" + this.urlInp.value;
}
this.urlInp.value = this.urlInp.value.replace("//", "/");
this.resumeEl.textContent = `http${
this.sslCheck.getAttribute("data-checked") === "true" ? "s" : ""
}://${this.servInp.value}${this.urlInp.value}`;
@ -592,9 +593,12 @@
// send form and wait for response
const api = `http${
let api = `http${
this.sslCheck.getAttribute("data-checked") === "true" ? "s" : ""
}://${this.servInp.value}${this.urlInp.value}`;
if (!api.endsWith("/")) {
api = `${api}/`;
}
fetch(window.location.href, {
method: "POST",
@ -604,11 +608,11 @@
.then((res) => {
if (res.status === 200) {
setTimeout(() => {
window.open(`${api}/login`, "_self");
window.open(`${api}login`, "_self");
}, 60000);
setTimeout(() => {
setInterval(() => {
fetch(`${api}/check`, {
fetch(`${api}check`, {
mode: "cors",
cache: "no-cache",
})
@ -618,7 +622,7 @@
}
}).then(res => {
if (res.message === "ok") {
window.open(`${api}/login`, "_self");
window.open(`${api}login`, "_self");
}
})
.catch((err) => {});

2
tests/ui/plugins_page.py
View file

@ -114,7 +114,7 @@ try:
first_card = safe_get_element(DRIVER, By.XPATH, "/html/body/main/div/div/div/div[1]/h5")
assert isinstance(first_card, WebElement), "First card is not a WebElement"
if first_card.text != "Deactivated":
if first_card.text != "Plugin deactivated":
log_error(f"The {plugin} page should show that the plugin is deactivated, exiting ...")
exit(1)