Verified Commit 4f0bf4ca authored by Benjamin "Ziirish" SANS's avatar Benjamin "Ziirish" SANS
Browse files

setup pre-commit hook

parent 43253d82
Pipeline #1827 failed with stages
in 21 minutes and 28 seconds
...@@ -19,6 +19,18 @@ stages: ...@@ -19,6 +19,18 @@ stages:
- build - build
- deploy - deploy
test:format:
stage: test
image: python:3.8
script:
- black --check .
tags:
- lint
except:
- tags
- rc
- demo
test:lint:3.6: test:lint:3.6:
stage: test stage: test
image: python:3.6 image: python:3.6
...@@ -45,7 +57,7 @@ test:lint:3.7: ...@@ -45,7 +57,7 @@ test:lint:3.7:
test:lint:3.8: test:lint:3.8:
stage: test stage: test
image: python:3.8-rc image: python:3.8
script: script:
- pip install tox - pip install tox
- tox -e pep8 - tox -e pep8
...@@ -88,10 +100,9 @@ test:py:3.7: ...@@ -88,10 +100,9 @@ test:py:3.7:
reports: reports:
junit: .reports/burpui.junit.xml junit: .reports/burpui.junit.xml
# This test is temporarily disabled because werkzeug doesn't run yet on 3.8
test:py:3.8: test:py:3.8:
stage: test stage: test
image: python:3.8-rc image: python:3.8
script: script:
- pip install tox - pip install tox
- mkdir .reports - mkdir .reports
......
...@@ -9,8 +9,8 @@ Current ...@@ -9,8 +9,8 @@ Current
- **BREAKING**: the authentication backends section have been renamed with the ``:AUTH`` suffix - **BREAKING**: the authentication backends section have been renamed with the ``:AUTH`` suffix
- **BREAKING**: the ``prefix`` option has been moved from the ``[Global]`` configuration section to the ``[Production]`` one - **BREAKING**: the ``prefix`` option has been moved from the ``[Global]`` configuration section to the ``[Production]`` one
- Add: new `audit logging <https://git.ziirish.me/ziirish/burp-ui/issues/260>`_ system - Add: new `audit logging <https://git.ziirish.me/ziirish/burp-ui/issues/260>`_ system
- Add: new ``bui-monitor`` processes pool + ``async`` backend to parallelize some requests `#278 <https://git.ziirish.me/ziirish/burp-ui/issues/278>`_ - Add: new ``bui-monitor`` processes pool + ``async`` backend to parallelize some requests `#278 <https://git.ziirish.me/ziirish/burp-ui/issues/278>`_
- Add: new `listen` and `listen_status` options in burp-2.2.10 `#279 <https://git.ziirish.me/ziirish/burp-ui/issues/279>`_ - Add: new `listen` and `listen_status` options in burp-2.2.10 `#279 <https://git.ziirish.me/ziirish/burp-ui/issues/279>`_
- Add: new `order` keyword in ACL definitions in order to decide whether `rw` should be evaluated first or not `#305 <https://git.ziirish.me/ziirish/burp-ui/issues/305>`__ - Add: new `order` keyword in ACL definitions in order to decide whether `rw` should be evaluated first or not `#305 <https://git.ziirish.me/ziirish/burp-ui/issues/305>`__
- Add: new `exclude` keyword in ACL definitions in order to exclude some clients from the rules `#305 <https://git.ziirish.me/ziirish/burp-ui/issues/305>`__ - Add: new `exclude` keyword in ACL definitions in order to exclude some clients from the rules `#305 <https://git.ziirish.me/ziirish/burp-ui/issues/305>`__
- Add: new *static templates* that allow you to create *onetime* (variables) templates `#280 <https://git.ziirish.me/ziirish/burp-ui/issues/280>`_ - Add: new *static templates* that allow you to create *onetime* (variables) templates `#280 <https://git.ziirish.me/ziirish/burp-ui/issues/280>`_
......
...@@ -134,7 +134,7 @@ width:100%; ...@@ -134,7 +134,7 @@ width:100%;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
-moz-background-clip: padding; -moz-background-clip: padding;
background-clip: padding-box; background-clip: padding-box;
width:100%; width:100%;
} }
.tt-suggestion { .tt-suggestion {
...@@ -219,7 +219,7 @@ svg text { ...@@ -219,7 +219,7 @@ svg text {
color: #697075; color: #697075;
} }
@keyframes blink { @keyframes blink {
0% { opacity: 1.0; } 0% { opacity: 1.0; }
50% { opacity: 0.0; } 50% { opacity: 0.0; }
100% { opacity: 1.0; } 100% { opacity: 1.0; }
......
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
"sSortAscending": ": Activar para ordenar la columna de manera ascendente", "sSortAscending": ": Activar para ordenar la columna de manera ascendente",
"sSortDescending": ": Activar para ordenar la columna de manera descendente" "sSortDescending": ": Activar para ordenar la columna de manera descendente"
} }
} }
\ No newline at end of file
...@@ -22,4 +22,4 @@ ...@@ -22,4 +22,4 @@
"sSortAscending": ": attiva per ordinare la colonna in ordine crescente", "sSortAscending": ": attiva per ordinare la colonna in ordine crescente",
"sSortDescending": ": attiva per ordinare la colonna in ordine decrescente" "sSortDescending": ": attiva per ordinare la colonna in ordine decrescente"
} }
} }
\ No newline at end of file
...@@ -116,7 +116,7 @@ var _sessions_table = $('#table-sessions').DataTable( { ...@@ -116,7 +116,7 @@ var _sessions_table = $('#table-sessions').DataTable( {
return '<span data-toggle="tooltip" title="'+data+'">'+moment(data, moment.ISO_8601).tz(TIMEZONE).subtract(3, 'seconds').fromNow()+'</span>'; return '<span data-toggle="tooltip" title="'+data+'">'+moment(data, moment.ISO_8601).tz(TIMEZONE).subtract(3, 'seconds').fromNow()+'</span>';
} }
}, },
{ {
data: 'ua', data: 'ua',
render: function( data, type, row ) { render: function( data, type, row ) {
if (type === 'filter' || type === 'sort') { if (type === 'filter' || type === 'sort') {
......
...@@ -71,7 +71,7 @@ $( document ).ready(function() { ...@@ -71,7 +71,7 @@ $( document ).ready(function() {
path: '{{ url_for("api.client_tree", name=cname, backup=nbackup, server=server) }}', path: '{{ url_for("api.client_tree", name=cname, backup=nbackup, server=server) }}',
}, },
}, },
source: function() { source: function() {
{% if edit and edit.found -%} {% if edit and edit.found -%}
url = '{{ url_for("api.client_tree", name=cname, backup=nbackup, server=server, root=edit.roots, recursive=True, selected=True) }}'; url = '{{ url_for("api.client_tree", name=cname, backup=nbackup, server=server, root=edit.roots, recursive=True, selected=True) }}';
{% else -%} {% else -%}
...@@ -230,7 +230,7 @@ $( document ).ready(function() { ...@@ -230,7 +230,7 @@ $( document ).ready(function() {
$("#form-restore").on('submit', function(e) { $("#form-restore").on('submit', function(e) {
var $preparingFileModal = $("#restore-modal"); var $preparingFileModal = $("#restore-modal");
$preparingFileModal.modal('toggle'); $preparingFileModal.modal('toggle');
{% if config.WITH_CELERY -%} {% if config.WITH_CELERY -%}
......
...@@ -102,7 +102,7 @@ var _client = function() { ...@@ -102,7 +102,7 @@ var _client = function() {
var html = table.node().outerHTML; var html = table.node().outerHTML;
if (d.footer !== undefined) if (d.footer !== undefined)
html += "<div class='footer'>" + d.footer + "</div>"; html += "<div class='footer'>" + d.footer + "</div>";
return html; return html;
}); });
_chart_stats.bars.forceY([0]); _chart_stats.bars.forceY([0]);
......
...@@ -285,7 +285,7 @@ var _sessions_table = $('#table-sessions').DataTable( { ...@@ -285,7 +285,7 @@ var _sessions_table = $('#table-sessions').DataTable( {
return '<span data-toggle="tooltip" title="'+data+'">'+moment(data, moment.ISO_8601).tz(TIMEZONE).subtract(3, 'seconds').fromNow()+'</span>'; return '<span data-toggle="tooltip" title="'+data+'">'+moment(data, moment.ISO_8601).tz(TIMEZONE).subtract(3, 'seconds').fromNow()+'</span>';
} }
}, },
{ {
data: 'ua', data: 'ua',
render: function( data, type, row ) { render: function( data, type, row ) {
if (type === 'filter' || type === 'sort') { if (type === 'filter' || type === 'sort') {
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
{% include "notifications.html" %} {% include "notifications.html" %}
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main"> <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
{% include "small_topbar.html" %} {% include "small_topbar.html" %}
<ul class="breadcrumb" style="margin-bottom: 5px;"> <ul class="breadcrumb" style="margin-bottom: 5px;">
<li class="active">{{ _('Home') }}</li> <li class="active">{{ _('Home') }}</li>
</ul> </ul>
<br /> <br />
<h1 class="page-header">{{ _('Servers') }}</h1> <h1 class="page-header">{{ _('Servers') }}</h1>
......
...@@ -2782,4 +2782,3 @@ msgstr "" ...@@ -2782,4 +2782,3 @@ msgstr ""
#~ " <em>moderator</em> o con <em> demo " #~ " <em>moderator</em> o con <em> demo "
#~ "</em> / <em> demo </em>. \n" #~ "</em> / <em> demo </em>. \n"
#~ " " #~ " "
...@@ -2428,4 +2428,3 @@ msgstr "Mise à jour" ...@@ -2428,4 +2428,3 @@ msgstr "Mise à jour"
#~ msgid "Backends list" #~ msgid "Backends list"
#~ msgstr "Liste des Backends" #~ msgstr "Liste des Backends"
...@@ -2709,4 +2709,3 @@ msgstr "" ...@@ -2709,4 +2709,3 @@ msgstr ""
#~ " / <em>moderator</em> sia come " #~ " / <em>moderator</em> sia come "
#~ "<em>demo</em> / <em>demo</em>.\n" #~ "<em>demo</em> / <em>demo</em>.\n"
#~ " " #~ " "
# This is an example config file for the burp server. # This is an example config file for the burp server.
mode = server mode = server
# The default addresses to listen on depend upon compile time options. # The default addresses to listen on depend upon compile time options.
# They may be overridden here. # They may be overridden here.
# The port and address options have been removed in 2.2.10 # The port and address options have been removed in 2.2.10
......
...@@ -31,4 +31,3 @@ basicConstraints = CA:FALSE ...@@ -31,4 +31,3 @@ basicConstraints = CA:FALSE
[ policy_anything ] [ policy_anything ]
commonName = supplied commonName = supplied
...@@ -54,7 +54,7 @@ ssl_cert = /tmp/burp/ssl_cert-client.pem ...@@ -54,7 +54,7 @@ ssl_cert = /tmp/burp/ssl_cert-client.pem
ssl_key = /tmp/burp/ssl_cert-client.key ssl_key = /tmp/burp/ssl_cert-client.key
# Client SSL ciphers # Client SSL ciphers
#ssl_ciphers = #ssl_ciphers =
# SSL key password # SSL key password
ssl_key_password = password ssl_key_password = password
...@@ -105,4 +105,3 @@ exclude_comp=bz2 ...@@ -105,4 +105,3 @@ exclude_comp=bz2
exclude_comp=gz exclude_comp=gz
#encryption_password = My^$pAsswIrD%@ #encryption_password = My^$pAsswIrD%@
...@@ -5,7 +5,7 @@ index 4d48597c..63cb6ebf 100644 ...@@ -5,7 +5,7 @@ index 4d48597c..63cb6ebf 100644
@@ -279,18 +279,22 @@ EVP_CIPHER_CTX *enc_setup(int encrypt, const char *encryption_password) @@ -279,18 +279,22 @@ EVP_CIPHER_CTX *enc_setup(int encrypt, const char *encryption_password)
// compilation warnings on Macs. // compilation warnings on Macs.
unsigned char enc_iv[]={'[', 'l', 'k', 'd', '.', '$', 'G', 0xa3, '\0'}; unsigned char enc_iv[]={'[', 'l', 'k', 'd', '.', '$', 'G', 0xa3, '\0'};
- if(!(ctx=(EVP_CIPHER_CTX *)malloc(sizeof(EVP_CIPHER_CTX)))) - if(!(ctx=(EVP_CIPHER_CTX *)malloc(sizeof(EVP_CIPHER_CTX))))
+ if(!(ctx=(EVP_CIPHER_CTX *)EVP_CIPHER_CTX_new())) + if(!(ctx=(EVP_CIPHER_CTX *)EVP_CIPHER_CTX_new()))
{ {
...@@ -50,5 +50,5 @@ index 4d48597c..63cb6ebf 100644 ...@@ -50,5 +50,5 @@ index 4d48597c..63cb6ebf 100644
+ EVP_CIPHER_CTX_free(enc_ctx); + EVP_CIPHER_CTX_free(enc_ctx);
+ enc_ctx=NULL; + enc_ctx=NULL;
} }
if(!ret) if(!ret)
...@@ -31,4 +31,3 @@ basicConstraints = CA:FALSE ...@@ -31,4 +31,3 @@ basicConstraints = CA:FALSE
[ policy_anything ] [ policy_anything ]
commonName = supplied commonName = supplied
...@@ -63,7 +63,7 @@ ssl_cert = /tmp/burp2/ssl_cert-client.pem ...@@ -63,7 +63,7 @@ ssl_cert = /tmp/burp2/ssl_cert-client.pem
ssl_key = /tmp/burp2/ssl_cert-client.key ssl_key = /tmp/burp2/ssl_cert-client.key
# Client SSL ciphers # Client SSL ciphers
#ssl_ciphers = #ssl_ciphers =
# Client SSL compression. Default is zlib5. Set to zlib0 to turn it off. # Client SSL compression. Default is zlib5. Set to zlib0 to turn it off.
#ssl_compression = zlib5 #ssl_compression = zlib5
...@@ -122,4 +122,3 @@ exclude_comp=gz ...@@ -122,4 +122,3 @@ exclude_comp=gz
# When enabled, this causes problems in the phase1 scan (such as an 'include' # When enabled, this causes problems in the phase1 scan (such as an 'include'
# being missing) to be treated as fatal errors. The default is 0. # being missing) to be treated as fatal errors. The default is 0.
#scan_problem_raises_error=1 #scan_problem_raises_error=1
FROM registry.ziirish.me/ziirish/burp-ui:demo FROM registry.ziirish.me/ziirish/burp-ui:demo
ADD assets/config/ /app/setup/config/ ADD assets/config/ /app/setup/config/
ADD assets/init /app/init ADD assets/init /app/init
RUN chmod 755 /app/init RUN chmod 755 /app/init
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment