mirror of https://gitlab.crans.org/bde/nk20
Remove Django CAS server and add oauth toolkit
This commit is contained in:
parent
ac2d1e8111
commit
70448db8e5
|
@ -16,7 +16,7 @@ py37-django22:
|
||||||
apt-get install --no-install-recommends -t buster-backports -y
|
apt-get install --no-install-recommends -t buster-backports -y
|
||||||
python3-django python3-django-crispy-forms
|
python3-django python3-django-crispy-forms
|
||||||
python3-django-extensions python3-django-filters python3-django-polymorphic
|
python3-django-extensions python3-django-filters python3-django-polymorphic
|
||||||
python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
|
python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
|
||||||
python3-babel python3-lockfile python3-pip python3-phonenumbers
|
python3-babel python3-lockfile python3-pip python3-phonenumbers
|
||||||
python3-bs4 python3-setuptools tox texlive-xetex
|
python3-bs4 python3-setuptools tox texlive-xetex
|
||||||
script: tox -e py37-django22
|
script: tox -e py37-django22
|
||||||
|
@ -33,7 +33,7 @@ py38-django22:
|
||||||
apt-get install --no-install-recommends -y
|
apt-get install --no-install-recommends -y
|
||||||
python3-django python3-django-crispy-forms
|
python3-django python3-django-crispy-forms
|
||||||
python3-django-extensions python3-django-filters python3-django-polymorphic
|
python3-django-extensions python3-django-filters python3-django-polymorphic
|
||||||
python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
|
python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
|
||||||
python3-babel python3-lockfile python3-pip python3-phonenumbers
|
python3-babel python3-lockfile python3-pip python3-phonenumbers
|
||||||
python3-bs4 python3-setuptools tox texlive-xetex
|
python3-bs4 python3-setuptools tox texlive-xetex
|
||||||
script: tox -e py38-django22
|
script: tox -e py38-django22
|
||||||
|
|
|
@ -8,7 +8,7 @@ RUN apt-get update && \
|
||||||
apt-get install --no-install-recommends -t buster-backports -y \
|
apt-get install --no-install-recommends -t buster-backports -y \
|
||||||
python3-django python3-django-crispy-forms \
|
python3-django python3-django-crispy-forms \
|
||||||
python3-django-extensions python3-django-filters python3-django-polymorphic \
|
python3-django-extensions python3-django-filters python3-django-polymorphic \
|
||||||
python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil \
|
python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil \
|
||||||
python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
|
python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
|
||||||
python3-bs4 python3-setuptools \
|
python3-bs4 python3-setuptools \
|
||||||
uwsgi uwsgi-plugin-python3 \
|
uwsgi uwsgi-plugin-python3 \
|
||||||
|
|
|
@ -93,7 +93,7 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
|
||||||
$ sudo apt install --no-install-recommends -t buster-backports -y \
|
$ sudo apt install --no-install-recommends -t buster-backports -y \
|
||||||
python3-django python3-django-crispy-forms \
|
python3-django python3-django-crispy-forms \
|
||||||
python3-django-extensions python3-django-filters python3-django-polymorphic \
|
python3-django-extensions python3-django-filters python3-django-polymorphic \
|
||||||
python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil \
|
python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil \
|
||||||
python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
|
python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
|
||||||
python3-bs4 python3-setuptools \
|
python3-bs4 python3-setuptools \
|
||||||
uwsgi uwsgi-plugin-python3 \
|
uwsgi uwsgi-plugin-python3 \
|
||||||
|
|
|
@ -23,10 +23,10 @@
|
||||||
- python3-babel
|
- python3-babel
|
||||||
- python3-bs4
|
- python3-bs4
|
||||||
- python3-django
|
- python3-django
|
||||||
- python3-django-cas-server
|
|
||||||
- python3-django-crispy-forms
|
- python3-django-crispy-forms
|
||||||
- python3-django-extensions
|
- python3-django-extensions
|
||||||
- python3-django-filters
|
- python3-django-filters
|
||||||
|
- python3-django-oauth-toolkit
|
||||||
- python3-django-polymorphic
|
- python3-django-polymorphic
|
||||||
- python3-djangorestframework
|
- python3-djangorestframework
|
||||||
- python3-lockfile
|
- python3-lockfile
|
||||||
|
|
|
@ -44,9 +44,3 @@ if "rest_framework" in settings.INSTALLED_APPS:
|
||||||
from rest_framework.authtoken.admin import *
|
from rest_framework.authtoken.admin import *
|
||||||
from rest_framework.authtoken.models import *
|
from rest_framework.authtoken.models import *
|
||||||
admin_site.register(Token, TokenAdmin)
|
admin_site.register(Token, TokenAdmin)
|
||||||
|
|
||||||
if "cas_server" in settings.INSTALLED_APPS:
|
|
||||||
from cas_server.admin import *
|
|
||||||
from cas_server.models import *
|
|
||||||
admin_site.register(ServicePattern, ServicePatternAdmin)
|
|
||||||
admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"model": "cas_server.servicepattern",
|
|
||||||
"pk": 1,
|
|
||||||
"fields": {
|
|
||||||
"pos": 1,
|
|
||||||
"pattern": ".*",
|
|
||||||
"name": "REPLACEME"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -49,13 +49,6 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if "cas_server" in INSTALLED_APPS:
|
|
||||||
# CAS Settings
|
|
||||||
CAS_AUTO_CREATE_USER = False
|
|
||||||
CAS_LOGO_URL = "/static/img/Saperlistpopette.png"
|
|
||||||
CAS_FAVICON_URL = "/static/favicon/favicon-32x32.png"
|
|
||||||
CAS_SHOW_POWERED = False
|
|
||||||
|
|
||||||
if "logs" in INSTALLED_APPS:
|
if "logs" in INSTALLED_APPS:
|
||||||
MIDDLEWARE += ('note_kfet.middlewares.SessionMiddleware',)
|
MIDDLEWARE += ('note_kfet.middlewares.SessionMiddleware',)
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
# CAS
|
# CAS
|
||||||
OPTIONAL_APPS = [
|
OPTIONAL_APPS = [
|
||||||
# 'cas_server',
|
|
||||||
# 'debug_toolbar'
|
# 'debug_toolbar'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -1,99 +0,0 @@
|
||||||
{% load i18n %}{% load static %}{% get_current_language as LANGUAGE_CODE %}<!DOCTYPE html>
|
|
||||||
<html{% if LANGUAGE_CODE %} lang="{{LANGUAGE_CODE}}"{% endif %}>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<title>{% block title %}{% trans "Central Authentication Service" %}{% endblock %}</title>
|
|
||||||
<link href="{{settings.CAS_COMPONENT_URLS.bootstrap3_css}}" rel="stylesheet">
|
|
||||||
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
|
||||||
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
|
||||||
<!--[if lt IE 9]>
|
|
||||||
<script src="{{settings.CAS_COMPONENT_URLS.html5shiv}}"></script>
|
|
||||||
<script src="{{settings.CAS_COMPONENT_URLS.respond}}"></script>
|
|
||||||
<![endif]-->
|
|
||||||
{% if settings.CAS_FAVICON_URL %}<link rel="shortcut icon" href="{{settings.CAS_FAVICON_URL}}" />{% endif %}
|
|
||||||
<link href="{% static "cas_server/styles.css" %}" rel="stylesheet">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="wrap">
|
|
||||||
<div class="container">
|
|
||||||
{% if auto_submit %}<noscript>{% endif %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
|
|
||||||
<h1 id="app-name">
|
|
||||||
{% if settings.CAS_LOGO_URL %}<img src="{{settings.CAS_LOGO_URL}}" alt="cas-logo" />{% endif %}
|
|
||||||
Authentification Note Kfet 2020</h1>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% if auto_submit %}</noscript>{% endif %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-lg-3 col-md-3 col-sm-2 col-xs-12"></div>
|
|
||||||
<div class="col-lg-6 col-md-6 col-sm-8 col-xs-12">
|
|
||||||
{% if auto_submit %}<noscript>{% endif %}
|
|
||||||
{% for msg in CAS_INFO_RENDER %}
|
|
||||||
<div class="alert alert-{{msg.type}}{% if msg.discardable %} alert-dismissable{% endif %}">
|
|
||||||
{% if msg.discardable %}<button type="button" class="close" data-dismiss="alert" aria-hidden="true" id="info-{{msg.name}}">×</button>{% endif %}
|
|
||||||
<p>{{msg.message}}</p>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
{% if settings.CAS_NEW_VERSION_HTML_WARNING and upgrade_available %}
|
|
||||||
<div class="alert alert-info alert-dismissable">
|
|
||||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true" id="alert-version">×</button>
|
|
||||||
<p>{% blocktrans %}A new version of the application is available. This instance runs {{VERSION}} and the last version is {{LAST_VERSION}}. Please consider upgrading.{% endblocktrans %}</p>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% block ante_messages %}{% endblock %}
|
|
||||||
{% for message in messages %}
|
|
||||||
<div {% spaceless %}
|
|
||||||
{% if message.level == message_levels.DEBUG %}
|
|
||||||
class="alert alert-warning"
|
|
||||||
{% elif message.level == message_levels.INFO %}
|
|
||||||
class="alert alert-info"
|
|
||||||
{% elif message.level == message_levels.SUCCESS %}
|
|
||||||
class="alert alert-success"
|
|
||||||
{% elif message.level == message_levels.WARNING %}
|
|
||||||
class="alert alert-warning"
|
|
||||||
{% else %}
|
|
||||||
class="alert alert-danger"
|
|
||||||
{% endif %}
|
|
||||||
{% endspaceless %}>
|
|
||||||
<p>{{message}}</p>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
{% if auto_submit %}</noscript>{% endif %}
|
|
||||||
{% block content %}{% endblock %}
|
|
||||||
</div>
|
|
||||||
<div class="col-lg-3 col-md-3 col-sm-2 col-xs-0"></div>
|
|
||||||
</div>
|
|
||||||
</div> <!-- /container -->
|
|
||||||
</div>
|
|
||||||
<div style="clear: both;"></div>
|
|
||||||
{% if settings.CAS_SHOW_POWERED %}
|
|
||||||
<div id="footer">
|
|
||||||
<p><a class="text-muted" href="https://pypi.org/project/django-cas-server/">django-cas-server powered</a></p>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<script src="{{settings.CAS_COMPONENT_URLS.jquery}}"></script>
|
|
||||||
<script src="{{settings.CAS_COMPONENT_URLS.bootstrap3_js}}"></script>
|
|
||||||
<script src="{% static "cas_server/functions.js" %}"></script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
{% if settings.CAS_NEW_VERSION_HTML_WARNING and upgrade_available %}
|
|
||||||
discard_and_remember("#alert-version", "cas-alert-version", "{{LAST_VERSION}}");
|
|
||||||
{% endif %}
|
|
||||||
{% for msg in CAS_INFO_RENDER %}
|
|
||||||
{% if msg.discardable %}
|
|
||||||
discard_and_remember("#info-{{msg.name}}", "cas-info-{{msg.name}}", "{{msg.hash}}");
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% block javascript_inline %}{% endblock %}
|
|
||||||
</script>
|
|
||||||
{% block javascript %}{% endblock %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
<!--
|
|
||||||
Powered by django-cas-server version {{VERSION}}
|
|
||||||
|
|
||||||
Pypi: https://pypi.org/project/django-cas-server/
|
|
||||||
github: https://github.com/nitmir/django-cas-server
|
|
||||||
-->
|
|
|
@ -41,12 +41,6 @@ if settings.DEBUG:
|
||||||
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
|
|
||||||
|
|
||||||
if "cas_server" in settings.INSTALLED_APPS:
|
|
||||||
urlpatterns += [
|
|
||||||
# Include CAS Server routers
|
|
||||||
path('cas/', include('cas_server.urls', namespace="cas_server")),
|
|
||||||
]
|
|
||||||
|
|
||||||
if "debug_toolbar" in settings.INSTALLED_APPS:
|
if "debug_toolbar" in settings.INSTALLED_APPS:
|
||||||
import debug_toolbar
|
import debug_toolbar
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
beautifulsoup4~=4.7.1
|
beautifulsoup4~=4.7.1
|
||||||
Django~=2.2.15
|
Django~=2.2.15
|
||||||
django-bootstrap-datepicker-plus~=3.0.5
|
django-bootstrap-datepicker-plus~=3.0.5
|
||||||
django-cas-server>=1.2.0
|
|
||||||
django-colorfield~=0.3.2
|
django-colorfield~=0.3.2
|
||||||
django-crispy-forms~=1.7.2
|
django-crispy-forms~=1.7.2
|
||||||
django-extensions~=2.1.4
|
django-extensions~=2.1.4
|
||||||
django-filter~=2.1.0
|
django-filter~=2.1.0
|
||||||
django-htcpcp-tea~=0.3.1
|
django-htcpcp-tea~=0.3.1
|
||||||
django-mailer~=2.0.1
|
django-mailer~=2.0.1
|
||||||
|
django-oauth-toolkit~=0.11.0
|
||||||
django-phonenumber-field~=5.0.0
|
django-phonenumber-field~=5.0.0
|
||||||
django-polymorphic~=2.0.3
|
django-polymorphic~=2.0.3
|
||||||
djangorestframework~=3.9.0
|
djangorestframework~=3.9.0
|
||||||
|
|
Loading…
Reference in New Issue