Skip to content

Commit

Permalink
Merge branch 'release/3.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
MKodde committed May 4, 2021
2 parents 8f62780 + f289b59 commit 78ead56
Show file tree
Hide file tree
Showing 199 changed files with 19,414 additions and 5,996 deletions.
16 changes: 1 addition & 15 deletions app/autoload.php → .docheader
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?php

/**
* Copyright 2014 SURFnet bv
* Copyright %regexp:\d{4}% SURFnet %regexp:(B.V.|bv)%
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,15 +13,3 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

use Doctrine\Common\Annotations\AnnotationRegistry;
use Composer\Autoload\ClassLoader;

/**
* @var ClassLoader $loader
*/
$loader = require __DIR__.'/../vendor/autoload.php';

AnnotationRegistry::registerLoader(array($loader, 'loadClass'));

return $loader;
14 changes: 14 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# In all environments, the following files are loaded if they exist,
# the latter taking precedence over the former:
#
# * .env contains default values for the environment variables needed by the app
# * .env.local uncommitted file with local overrides
# * .env.$APP_ENV committed environment-specific defaults
# * .env.$APP_ENV.local uncommitted environment-specific overrides
#
# Real environment variables win over .env files.
#
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
#
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
4 changes: 4 additions & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# define your env variables for the test env here
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
46 changes: 29 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
/web/bundles/
/web/app_dev.php
/web/app_dev.php.dist
/web/app_test.php
/web/js
/web/css
/app/bootstrap.php.cache
/app/cache/*
/app/config/parameters.yml
/app/config/samlstepupproviders_parameters.yml
/app/config/global_view_parameters.yml
/app/logs/*
!app/cache/.gitkeep
!app/logs/.gitkeep
/build/
/config/legacy/parameters.yaml
/config/legacy/samlstepupproviders.yaml
/config/legacy/samlstepupproviders_parameters.yaml
/config/legacy/global_view_parameters.yaml
/vendor/
/var/
/composer.phar
/cache.properties
/app/SymfonyRequirements.php
/app/check.php
/bin/*
!/bin/extract-translations.sh
!/bin/console
.idea
node_modules
public/build
npm-debug.log
yarn-error.log
/phpunit.xml
.phpunit.result.cache
/.phpcs-cache
.phpunit
.phpunit.result.cache
config/preload.php
local-php-security-checker
.env.*

###> symfony/framework-bundle ###
/.env.local
/.env.local.php
/.env.*.local
/config/secrets/prod/prod.decrypt.private.php
/public/bundles/
/var/
/vendor/
###< symfony/framework-bundle ###
29 changes: 18 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,39 @@
language: php

php:
- 5.6
- 7.0
- 7.2
- 7.4

matrix:
fast_finish: true
allow_failures:
- php: 7.4

env:
global:
- SYMFONY_ENV=test
- APP_ENV=test

cache:
directories:
- ~/.composer

before_script:
- phpenv config-add .travis.php.ini
- composer self-update
- composer self-update --1
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash
- nvm install 10.22.0
- curl --compressed -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
- composer install --prefer-dist
- composer frontend-install

script:
- ant
- composer test

after_failure:
- sudo tail -500 /var/log/syslog

branches:
only:
- master
- develop
- release/2.10

addons:
apt:
packages:
- ant
41 changes: 39 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,52 @@
# Changelog

## 3.4.0
**Feature**
* Self vetting (vet token with previously RA vetted token) #227

## 3.3.0
**Feature**
* Add GSSP UserAttributes extensions to registration-SAMLAuthnRequest to pass user-information to GSSP's

## 3.0.3:
* Add GSSP UserAttributes extensions to registration-SAMLAuthnRequest to pass user-information to GSSP's
* Update dependencies

## 3.2.0
Platform update
* Drop support for php 5.6, Use PHP7.2
* Upgrade to Synfony 4
* Allow HTML in explanation/description
* Update dependencies

## 3.1.0
A release with bugfixes after initial FGA tests
* Fix exception controller authentication exceptions #179
* Update MW-client-bundle #178
* Install various security updates #177

## 3.0.1
This is a security release that will harden the application against CVE 2019-346
* Upgrade Stepup-saml-bundle to version 4.1.8 #176

## 3.0.0 FGA (fine grained authorization)

The new fine grained authorization logic will allow Ra's from other institutions to accredidate RA's on behalf of another organisation. This is determined based on the institution configuration. https://github.com/OpenConext/Stepup-Deploy/wiki/rfc-fine-grained-authorization/b6852587baee698cccae7ebc922f29552420a296

**Features & Bugfixes**
The changes to SelfService in regards to the FGA changes only where to remain compatible with API changes made for Stepup-RA. No new features have been added.

## 2.10.7
This is a security release that will harden the application against CVE 2019-346
* Upgrade xmlseclibs to version 3.0.4 #175
* Upgrade Stepup-saml-bundle to version 4.1.8 #175

## 2.10.6
**Bugfix**
* Create a pdf base template to support local url's #168

## 2.10.5
Do not use this release, it contains unreleased fine grained authorization changes.
**Bugfix**
* Create a pdf base template to support local url's #168

## 2.10.4
**Improvement**
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This component is part of "Step-up Authentication as-a Service" and requires oth

## Requirements

* PHP 5.6+ or PHP7
* PHP 7.2
* [Composer](https://getcomposer.org/)
* A web server (Apache, Nginx)
* Graylog2 (or disable this Monolog handler)
Expand All @@ -16,9 +16,7 @@ This component is part of "Step-up Authentication as-a Service" and requires oth

## Installation

Clone the repository or download the archive to a directory. Install the dependencies by running `composer install`.

Run `app/console mopa:bootstrap:symlink:less` to configure Bootstrap symlinks.
Clone the repository or download the archive to a directory. Install the dependencies by running `composer install && yarn install`.

## Updating translations

Expand Down
7 changes: 0 additions & 7 deletions app/AppCache.php

This file was deleted.

57 changes: 0 additions & 57 deletions app/AppKernel.php

This file was deleted.

83 changes: 0 additions & 83 deletions app/Resources/views/base.html.twig

This file was deleted.

Loading

0 comments on commit 78ead56

Please sign in to comment.