Commit f0a9ce90 authored by Bonnegent's avatar Bonnegent
Browse files

cours #7

parent f5ab78df
......@@ -80,7 +80,7 @@
* webui/templates/webui/parefeu\_detail.html
## Ordre conseillé #6
### permetttre l'édition des règles du parefeu
### permettre l'édition des règles du parefeu
* ajout
* changer la priorité
* changer le status actif
......
......@@ -26,6 +26,8 @@ FAIL_INVALID_TEMPLATE_VARS = True
### Exécution
~~~
$ source /opt/venv/spyder/bin/activate
$ echo "créer le fichier pytest.ini"
$ pytest
$ pytest -v
~~~
......@@ -101,15 +103,22 @@ def parefeu1(admin_user):
### test\_nb\_regles\_parefeu(admin\_user, parefeu1)
* on crée plusieurs règles
* vérifie le bon fonctionnement de Parefeu.nombre\_de\_regles()
* Parefeu.nombre\_de\_regles() doit donner le bon nombre
### test\_nb\_regles\_modele(admin\_user, parefeu1, parefeu2)
* comme précédent mais pour les règles sur un modèle
* parefeu2 est le modele de parefeu1
* parefeu1 n'a pas de règles
* parefeu2 a des règles
* nb\_regles doit retourner nb\_regle de parefeu1 + parefeu2
### test\_parefeu\_level1(admin\_client, parefeu1, parefeu2)
* un parefeu ne peut être le modèle de son modèle
* parefeu1.modele = parefeu2
* parefeu2.modele = parefeu1
* raise ValidationError
* [webui/models.py] définir Parefeu.clean()
* voir la documentation
* prise en compte dans les formulaires
......@@ -123,6 +132,9 @@ def parefeu1(admin_user):
* définir une profondeur maximum de parcous (12)
* raise ValidationError
* écrire le test
* parefeu1.modele = parefeu2
* parefeu2.modele = parefeu3
* parefeu3.modele = parefeu1
## Documentations
### liens
......
......@@ -2,3 +2,84 @@
% Sébastien Bonnegent
% https://framagit.org/bonnegent/cours\_django
# Gabarits avancés
## Pour la séance
### Objectifs
* inclusion de gabarit avec paramètre
* édition des règles d'un parefeu
# À faire
## La classe Regle
### webui/models.py
* set\_actif(self):
* change 'self.actif'
* save() pour la date de dernière modif
* set\_priorite(self, nb):
* affecte une priorité
* test si c'est un nombre entier
* et qu'il est strictement positif
## Formulaires
### webui/forms.py
* écrire RegleForm
* champs: priorite, groupe, services, interface, sens
## Les vues
### webui/views.py
* def regle\_create(request, parefeu\_id)
* création d'une nouvelle règle
* redirect vers la page du parefeu
* def regle\_activable(request, pk)
* état actif / inactif
* def regle\_priorite(request, pk, remove, nombre)
* pk: clé d'une règle
* remove: booléen (True on soustrait)
* nombre: le nombre a enlevé/ajouté
* def regle\_delete(request, pk)
* suppression d'une règle inactive
* redirect vers la page du parefeu
## Liens URI / views
### webui/urls.py
* rendre disponible les fonctions créées précédemment
## Gabarits #1: afficher les régles d'un parefeu
### webui/templates/webui/regle\_list.html
* créer un tableau
* affiche les règles se trouvant dans la liste regle\_list
* utiliser regle\_list.html dans parefeu\_detail.html
. . .
### webui/templates/webui/parefeu\_detail.html
~~~
{% include "webui/regle_list.html" with
regle_list=parefeu.modele.regle_set.all only %}
{% include "webui/regle_list.html" with
regle_list=parefeu.regle_set.all %}
~~~
## Gabarits #2: mode édition
### webui/templates/webui/regle\_list.html
* prise en compte de la variable can\_edit
* mode édition
* ajout d'une nouvelle règle
# Fin
## FireWall Manager
https://framagit.org/bonnegent/fwm
#!/bin/bash
# permet de créer l'arborescense pour les supports de cours
SRC="../fwm"
DST="supports_cours_06"
DST="supports_cours_07"
if [ ! -d $DST ]
then
......
No preview for this file type
File added
*.pyc
conf/settings.py
venv/
docs/_build/
*/__pycache__
db.sqlite3*
"""
Django settings for conf project.
Generated by 'django-admin startproject' using Django 1.11.5.
For more information on this file, see
https://docs.djangoproject.com/en/1.11/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.11/ref/settings/
"""
import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'dy4&wm6#!jxua(=f*a#%&y1-5f%ew87pm-r!vhrgq4&2ggh=b#'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = []
VERSION = "#171009"
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'webui',
'django_extensions',
'docs',
'bootstrap3',
]
DOCS_ROOT = os.path.join(BASE_DIR, 'docs/_build/html')
DOCS_ACCESS = 'login_required'
EMAIL_HOST = "127.0.0.1"
EMAIL_PORT = 2525
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
ROOT_URLCONF = 'conf.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, 'templates')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
]
WSGI_APPLICATION = 'conf.wsgi.application'
# Database
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}
# Password validation
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/1.11/topics/i18n/
LANGUAGE_CODE = 'fr-fr'
TIME_ZONE = 'UTC'
USE_I18N = True
USE_L10N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.11/howto/static-files/
STATIC_URL = '/static/'
# Bootstrap
BOOTSTRAP3 = {
'jquery_url': '/static/webui/js/jquery-3.2.1.min.js',
'base_url': '/static/webui/',
'theme_url': '/static/webui/css/bootstrap-theme-flatly.min.css',
}
from .settings_common import *
DEBUG = True
ALLOWED_HOSTS = ['*']
SECRET_KEY = 'Une_clef_secrete_et_longue!'
from django.conf.urls import include
from django.conf.urls import url
from django.contrib import admin
# pour les fichiers static
from django.conf import settings
from django.conf.urls.static import static
urlpatterns = [
url(r'^accounts/', include('django.contrib.auth.urls')),
url(r'^admin/', admin.site.urls),
url(r'^docs/', include('docs.urls')),
url(r'^', include('webui.urls')),
]
if settings.DEBUG:
urlpatterns += static(settings.STATIC_URL,
document_root=settings.STATIC_ROOT)
"""
WSGI config for conf project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "conf.settings")
application = get_wsgi_application()
# Minimal makefile for Sphinx documentation
#
# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = python -msphinx
SPHINXPROJ = FireWallManager
SOURCEDIR = .
BUILDDIR = _build
# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
.PHONY: help Makefile
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
========
À propos
========
FWM permet de gérer des parefeux linux simple, à partir de modèle, et de
déployer directement les règles.
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# FireWall Manager documentation build configuration file, created by
# sphinx-quickstart on Tue Oct 3 13:45:49 2017.
#
# This file is execfile()d with the current directory set to its
# containing dir.
#
# Note that not all possible configuration values are present in this
# autogenerated file.
#
# All configuration values have a default; values that are commented out
# serve to show the default.
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
import sys
import os
import django
sys.path.insert(0, os.path.abspath('..'))
os.environ['DJANGO_SETTINGS_MODULE'] = 'conf.settings'
django.setup()
from django.conf import settings
# bootstrap
import sphinx_bootstrap_theme
# -- General configuration ------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
#
# needs_sphinx = '1.0'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.inheritance_diagram']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
#
# source_suffix = ['.rst', '.md']
source_suffix = '.rst'
# The master toctree document.
master_doc = 'index'
# General information about the project.
project = 'FireWall Manager'
copyright = '2017, S.Bonnegent - version %s' % settings.VERSION
author = 'S.Bonnegent'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
# version = '0.1'
version = settings.VERSION
# The full version, including alpha/beta/rc tags.
# release = 'a'
release = version
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = 'fr'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This patterns also effect to html_static_path and html_extra_path
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = False
# -- Options for HTML output ----------------------------------------------
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
#html_theme = 'alabaster'
html_theme = 'bootstrap'
html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
html_title = "Docs"
html_favicon = os.path.join("..", "webui", "static", "webui", "images",
"favicon.ico")
html_theme_options = {
'navbar_title': 'FWM',
'navbar_site_name': "Documentation",
'navbar_links': [(
'<span class="glyphicon glyphicon-home"></span>',
"/", True), ],
'navbar_sidebarrel': False,
'navbar_pagenav': False,
'navbar_pagenav_name': "Page",
'globaltoc_depth': 1,
'globaltoc_includehidden': "true",
'navbar_fixed_top': "true",
'source_link_position': "nav",
'bootswatch_theme': "flatly",
'bootstrap_version': "3",
}
html_show_sourcelink = False
html_show_sphinx = False
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#
# html_theme_options = {}
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
# Custom sidebar templates, must be a dictionary that maps document names
# to template names.
#
# This is required for the alabaster theme
# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
html_sidebars = {
}
# -- Options for HTMLHelp output ------------------------------------------
# Output file base name for HTML help builder.
htmlhelp_basename = 'FireWallManagerdoc'
# -- Options for LaTeX output ---------------------------------------------
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',
# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',
# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',
# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
}
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'FireWallManager.tex', 'FireWall Manager Documentation',
'S.Bonnegent', 'manual'),
]
# -- Options for manual page output ---------------------------------------
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'firewallmanager', 'FireWall Manager Documentation',
[author], 1)
]
# -- Options for Texinfo output -------------------------------------------
# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'FireWallManager', 'FireWall Manager Documentation',
author, 'FireWallManager', 'One line description of project.',
'Miscellaneous'),
]
FireWall Manager
================
.. toctree::
:maxdepth: 2
about
modeles
@ECHO OFF
pushd %~dp0
REM Command file for Sphinx documentation
if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=python -msphinx
)
set SOURCEDIR=.
set BUILDDIR=_build
set SPHINXPROJ=FireWallManager
if "%1" == "" goto help
%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The Sphinx module was not found. Make sure you have Sphinx installed,
echo.then set the SPHINXBUILD environment variable to point to the full
echo.path of the 'sphinx-build' executable. Alternatively you may add the
echo.Sphinx directory to PATH.
echo.
echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/
exit /b 1
)
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
goto end
:help
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
:end
popd
Supports Markdown
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