Commit fc797c3b authored by Boris Lucas's avatar Boris Lucas
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request libriciel/pole-signature/signature/libersign!48
parents 2fa688d5 cb16f9a1
/.gradle/
gradle/
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
## Considered rules from https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
\.idea/modules\.xml
\.idea/modules/*.iml
## The rest is taken from https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/shelf
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
.idea/modules.xml
.idea/*.iml
.idea/modules
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
### NetBeans ###
/nbproject/private/
/build/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
.DS_Store
SplittedSignatureApplet/SplittedSignatureApplet/dist/*
SplittedSignatureApplet/SplittedSignatureApplet/build/*
SplittedSignatureApplet/SplittedSignatureApplet/intellij-out/*
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/test/resources" type="java-test-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" scope="TEST">
<library name="JUnit4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="commons-lang-2.6" level="project" />
<orderEntry type="library" name="bcpkix-jdk15on-150" level="project" />
<orderEntry type="library" name="iaik_xsect" level="project" />
<orderEntry type="library" name="iaik_jce_full" level="project" />
<orderEntry type="library" name="iaikPkcs11Provider" level="project" />
<orderEntry type="library" name="iaikPkcs11Wrapper" level="project" />
<orderEntry type="library" name="bcprov-jdk15on-150" level="project" />
<orderEntry type="library" name="commons-httpclient-3.1" level="project" />
<orderEntry type="library" name="commons-ssl-0.3.0" level="project" />
<orderEntry type="library" name="xmlsec-1.4.6" level="project" />
<orderEntry type="library" name="xom-1.2.10" level="project" />
<orderEntry type="library" name="json-20140107" level="project" />
</component>
</module>
\ No newline at end of file
<component name="libraryTable">
<library name="bcpkix-jdk15on-150">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/bcpkix-jdk15on-150.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="bcprov-jdk15on-150">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/bcprov-jdk15on-150.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="commons-httpclient-3.1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/commons-httpclient-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="commons-lang-2.6">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/commons-lang-2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="commons-ssl-0.3.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/commons-ssl-0.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="iaikPkcs11Provider">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/iaikPkcs11Provider.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="iaikPkcs11Wrapper">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/iaikPkcs11Wrapper.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="iaik_jce_full">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/iaik_jce_full.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="iaik_xsect">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/iaik_xsect.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="json-20140107">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/json-20140107.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="xmlsec-1.4.6">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/xmlsec-1.4.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="xom-1.2.10">
<CLASSES>
<root url="jar://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/lib/xom-1.2.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/SplittedSignatureApplet/SplittedSignatureApplet/intellij-out" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/libersign.iml" filepath="$PROJECT_DIR$/.idea/libersign.iml" />
</modules>
</component>
</project>
\ No newline at end of file
......@@ -5,6 +5,13 @@ Tous les changements notables sur ce projet seront documentés dans ce fichier.
Ce format est basé sur [Keep a Changelog](http://keepachangelog.com/)
et ce projet adhère au [Semantic Versioning](http://semver.org/).
## [1.11.0] - 2020-11-02
### Modifications
- Changement de méthode de récupération de certificats :
filtrage des certificats révoqués ou non-affiliés à une authorité de certification connue.
## [1.9.13] - 2020-05-27
### Modifications
......
Contributing
============
## Deploying manually a Docker image
```bash
$ docker login gitlab.libriciel.fr:4567
$ docker build --pull -t gitlab.libriciel.fr:4567/libriciel/pole-signature/signature/libersign:latest .
$ docker push gitlab.libriciel.fr:4567/libriciel/pole-signature/signature/libersign:latest
```
# LiberSign
# Copyright (C) 2008-2020 Libriciel SCOP
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Build
FROM ubuntu:latest AS builder
RUN apt-get update && apt-get install -y wget
RUN mkdir -p /var/www/parapheur/libersign
COPY make.sh .
RUN ./make.sh PROD
# Serve
FROM nginx:1.17.8-alpine
## Remove default nginx website
RUN rm -rf /usr/share/nginx/html/*
COPY --from=builder /var/www/parapheur/libersign/ /usr/share/nginx/html/libersign/
ADD nginx.conf /etc/nginx/
CMD ["nginx", "-g", "daemon off;"]
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