Merge branch 'release/v0.10.0a'

.gitignore

@@ -102,7 +102,6 @@ ENV/
 ### Node template
 # Logs
 logs
-*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

.travis.yml

@@ -6,6 +6,25 @@ before_install:
   - sudo apt-get install -qq graphviz-dev python-setuptools python3-dev python-virtualenv python-pip
   - sudo apt-get install -qq firefox automake libtool libreadline6 libreadline6-dev libreadline-dev
   - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
+before_script:
+  - psql -c "create user manati_db_user with password 'password';" -U postgres
+  - psql -c 'create database manati_db_test;' -U postgres
+  - psql -c 'grant all privileges on database manati_db_test to manati_db_user;' -U postgres
+  - psql -c 'alter role manati_db_user createrole createdb;' -U postgres
+  - sudo redis-server /etc/redis/redis.conf --port 6379
+services:
+  - postgresql
+  - redis-server
 language: python
 python:
-  - "3.5"
+  - "2.7"
+install:
+  - pip install -r requirements/test.txt
+script:  # command to run tests
+  - pytest
+cache: pip
+notifications:
+  slack:
+    secure: EBGiTRO7dPrTJMeNTT8GWx0RTtwmeHPqRS2fYA5Cpz2jgxdE2vNAcO4Mi4Vkc8FvlWvqHzgNrcVmq2/5XaGokiy95bxsQLWXooixFhcHxu8gFKiAqc3jDSSExFQObVBnPiT9MFnR0YiAFvHEqnp0RZPfmGjqwlOp5z07//mYnW6QvvwlYVO7Jh4jHaBRUj8e9d5tUu0H/bd77g98ewjt9i62bcrMN+WrBov/ifAVmzwgmntwn7LhHWSioelja0cGV8n+LWLqz1gF23cmvsNHpf4r9pNKpeQqth3u3L2qfuZWprgJ/GMDDQ8k8UQKHaUrk7ZkhgXcTXtrUgZIGuxAx0jNwmjn/3uRDOTbbP26djEh0xUDa/Eicbv+apbun7VZmAeEmAAfBUgNRFIBeFbdPc2xWQK8i0P3JtCO3YwxD31Shzm7anHte7ftQqyhkrCPSbLXuCBRk2ZyG9h2lTtK4SDjhWwayZXIrYVdQ6aE5kDxTBfKfzXAxECkGuoO/uNmgbU+SPyCxhnluWgJE2Se/s800STpNUuQKIc20eDEiRfavJbDEE6Lfbh8xER6vo+G88FU+8T8gR2UjyUhpWY+8wWnCXFAssecWL5ODdlNCA5PgaHINfqBh9kx0QMd7+hQWdOk+1nwt3RenXQ+WJiuH/KkY4u4ZES1W5igmqcNDk4=
+    on_success: change # default: always
+    on_failure: always # default: always

CHANGELOG.rst

@@ -1,3 +1,17 @@
+0.10.0a
+----------
+* Adding settings for heroku deployment
+* Minor change in config/urls.py. Removing urls that we are not using and adding a routing http://localhost:8000/ or https://<YOUR-DOMAIN>/
+* Fixing bug with the user logout the page, it was wrong redirected. Now it is going to the login page.
+* Fixing bugs related with the new structured files
+* Adding library **bat** for processing BRO files. For now it is in the requirements/test.txt, for testing env. We will see if we will need it
+in another place of the system.
+* Adding testing settings and one unitest for the AnalysisSession model. Now, there are two method,
+one for testing the creation process of one analysis session with cisco type files and another one for  BRO http.log file case.
+For running the test is just necessary to use the console and execute **pytest**. The pytest.ini is already configured
+* Adding example (docs/example_weblogs) of BRO file and Apache file
+* Adding badges in README file
+
 0.9.2a
 ----------
 * Adding function when the users wants to remove an analysis session, the action will be enqueued, sometimes the

Procfile

@@ -1,2 +1,2 @@
-web: gunicorn config.wsgi:application
-
+web: bin/start-nginx bin/start-pgbouncer-stunnel uwsgi heroku_uwsgi.ini
+worker: python manage.py rqworker high default low

README.md

@@ -1,4 +1,9 @@
 # Project ManaTI
+[![Build Status](https://travis-ci.org/Piuliss/Manati.svg?branch=master)](https://travis-ci.org/Piuliss/Manati)
+[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/stratosphereips/Manati/issues)
+[![GPLv3 license](https://img.shields.io/badge/License-GPLv3-blue.svg)](http://perso.crans.org/besson/LICENSE.html)
+[![release](https://img.shields.io/badge/release-v0.9.2a-brightgreen.svg?style=flat)](https://github.com/stratosphereips/Manati/releases/latest)
+
 *Machine Learning for Threat Intuitive Analysis* 
 
 The goal of the ManaTI project is to develop machine learning techniques to assist an intuitive threat analyst to speed the discovery of new security problems. The machine learning will contribute to the analysis by finding new relationships and inferences. The project will include the development of a web interface for the analyst to interact with the data and the machine learning output.
@@ -23,6 +28,10 @@ This project is partially supported by Cisco Systems.
     ([@Piuliss](https://www.twitter.com/Piuliss), <raulbeni@gmail.com>, <benitrau@fit.cvut.cz>)
 - **Sebastian García** ([@eldracote](https://www.twitter.com/eldracote), <sebastian.garcia@agents.fel.cvut.cz>, <eldraco@gmail.com>)
 
+## App Screenshot
+
+![manati_screenshot](https://user-images.githubusercontent.com/1384962/36067482-75a78ca4-0ebe-11e8-886a-341adb06508b.png)
+
 ## Installation
 ManaTI is a Django project with a Postgres database and it works in Linux and MacOS. We recommend using a virtualenv environment to setup it. The installation steps for linux are:
 
@@ -217,9 +226,7 @@ cd path/to/project_directory
 python ./manage.py collectstatic --noinput
 sudo supervisord -c supervisor-manati.conf -n
 ```
-## ManaTI support
-We guarantee the correct functioning of ManaTI over Chrome browser 60+.
-We have reports that people are using it in Firefox 55+
+
 ## Docker Composer
 If you don't want to waste time installing ManaTI and you have docker installed,  you can just
  execute docker-compose. First clone the repository and go to the directory project.  
@@ -239,6 +246,11 @@ After this, just open your browser in [http://localhost:8000/manati_project/mana
 
 ## Restore DB
     psql manati_db -f backup.sql -U manati_db_user
+
+## Browser supported
+| [<img src="https://raw.githubusercontent.com/godban/browsers-support-badges/master/src/images/edge.png" alt="IE / Edge" width="16px" height="16px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/godban/browsers-support-badges/master/src/images/firefox.png" alt="Firefox" width="16px" height="16px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/godban/browsers-support-badges/master/src/images/chrome.png" alt="Chrome" width="16px" height="16px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/godban/browsers-support-badges/master/src/images/safari.png" alt="Safari" width="16px" height="16px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/godban/browsers-support-badges/master/src/images/opera.png" alt="Opera" width="16px" height="16px" />](http://godban.github.io/browsers-support-badges/)</br>Opera |[<img src="https://raw.githubusercontent.com/godban/browsers-support-badges/master/src/images/vivaldi.png" alt="Vivaldi" width="16px" height="16px" />](http://godban.github.io/browsers-support-badges/)</br>Vivaldi |
+| --------- | --------- | --------- | --------- | --------- | --------- |
+| N/A| 55+ | 60+ | N/A | N/A| N/A
 
 ## License
 

config/settings/base.py

@@ -348,6 +348,7 @@
 USERENA_SIGNIN_REDIRECT_URL = '/user_profiles/%(username)s/'
 LOGIN_URL = '/user_profiles/signin/'
 LOGOUT_URL = '/user_profiles/signout/'
+USERENA_REDIRECT_ON_SIGNOUT = '/manati_project/login/'
 USERENA_DISABLE_PROFILE_LIST = True
 USERENA_DISABLE_SIGNUP = True
 USERENA_REGISTER_USER = False

config/settings/test.py

@@ -38,6 +38,8 @@
     }
 }
 
+ALLOWED_HOSTS = env.list('DJANGO_ALLOWED_HOSTS', default=['manatiproject.com','*','localhost','127.0.0.1'])
+
 # TESTING
 # ------------------------------------------------------------------------------
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'

config/urls.py

@@ -2,16 +2,16 @@
 from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, RedirectView
 from django.views import defaults as default_views
 from django.contrib.auth import views
 import manati.login.views
 import manati.login.forms
 
 path_name = 'manati_project'
 urlpatterns = [
-    url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name='home'),
-    url(r'^about/$', TemplateView.as_view(template_name='pages/about.html'), name='about'),
+    # url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name='home'),
+    # url(r'^about/$', TemplateView.as_view(template_name='pages/about.html'), name='about'),
 
     # Django Admin, use {% url 'admin:index' %}
     url(settings.ADMIN_URL, admin.site.urls),
@@ -29,7 +29,7 @@
     url(r'^'+path_name+'/index.html$', manati.login.views.home, name="home"),
     url(r'^'+path_name+'/login/$', views.login, {'template_name': 'login.html', 'authentication_form': manati.login.forms.LoginForm}),
     url(r'^'+path_name+'/logout/$', views.logout, {'next_page':'/manati_project/login'}),
-    url(r'^', manati.login.views.home, name="home"),
+    url(r'^$','manati.analysis_sessions.views.new_analysis_session_view', name="redirect-default"),
 
 
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)