diff --git a/installing_deps.sh b/installing_deps.sh index 246fd2b2..bad6a9ce 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -95,6 +95,11 @@ mkdir -p $AIL_HOME/{PASTES,Blooms,dumps} pip3 install -U pip pip3 install -U -r pip3_packages_requirement.txt +#MISP PyTaxonomies +pip3 install -U git+https://github.com/MISP/PyTaxonomies +#MISP PyMISPGalaxies +pip3 install -U git+https://github.com/MISP/PyMISPGalaxies + # Pyfaup pushd faup/src/lib/bindings/python/ python3 setup.py install diff --git a/var/www/modules/Tags/Flask_Tags.py b/var/www/modules/Tags/Flask_Tags.py index 030060ee..98a809af 100644 --- a/var/www/modules/Tags/Flask_Tags.py +++ b/var/www/modules/Tags/Flask_Tags.py @@ -553,6 +553,7 @@ def galaxies(): icon.append(galaxie['icon']) version.append(galaxie['version']) type = galaxie['type'] + # FIXME remove this if type == 'mitre-pre-attack-relashipship': type = 'mitre-pre-attack-relationship' all_type.append(type) diff --git a/var/www/update_thirdparty.sh b/var/www/update_thirdparty.sh index c0208bed..7e99ebed 100755 --- a/var/www/update_thirdparty.sh +++ b/var/www/update_thirdparty.sh @@ -5,23 +5,27 @@ set -e wget http://dygraphs.com/dygraph-combined.js -O ./static/js/dygraph-combined.js SBADMIN_VERSION='3.3.7' +FONT_AWESOME_VERSION='4.7.0' rm -rf temp mkdir temp wget https://github.com/BlackrockDigital/startbootstrap-sb-admin/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}.zip wget https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}-2.zip +wget https://github.com/FortAwesome/Font-Awesome/archive/v${FONT_AWESOME_VERSION}.zip -O temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip unzip temp/${SBADMIN_VERSION}.zip -d temp/ unzip temp/${SBADMIN_VERSION}-2.zip -d temp/ +unzip temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip -d temp/ mv temp/startbootstrap-sb-admin-${SBADMIN_VERSION} temp/sb-admin mv temp/startbootstrap-sb-admin-2-${SBADMIN_VERSION} temp/sb-admin-2 +mv temp/Font-Awesome-${FONT_AWESOME_VERSION} temp/font-awesome rm -rf ./static/js/plugins mv temp/sb-admin/js/* ./static/js/ rm -rf ./static/fonts/ ./static/font-awesome/ mv temp/sb-admin/fonts/ ./static/ -mv temp/sb-admin/font-awesome/ ./static/ +mv temp/font-awesome/ ./static/ rm -rf ./static/css/plugins/ mv temp/sb-admin/css/* ./static/css/ @@ -60,3 +64,9 @@ mkdir -p ./static/image pushd static/image wget https://www.circl.lu/assets/images/logos/AIL.png -O AIL.png popd + +#active virtualenv +. ./../../AILENV/bin/activate +#Update MISP Taxonomies and Galaxies +pip3 install --upgrade git+https://github.com/MISP/PyTaxonomies +pip3 install --upgrade git+https://github.com/MISP/PyMISPGalaxies