Merge pull request #166 from OpenConext/feature/fine-grained-authoriz…

…ation

Merge the FGA feature branch back to develop

.travis.yml

@@ -21,6 +21,11 @@ cache:
 
 before_script:
   - phpenv config-add .travis.php.ini
+  # TODO: cleanup after FGA implementation!
+  # Use a travis composer.json version, that not uses the symlink solution for the middleware bundle, but an installation of a feature branch
+  - mv composer.json.travis composer.json
+  - mv composer.lock.travis composer.lock
+  # TODO: end of FGA specific build settings
   - composer self-update
   - composer install --prefer-dist
 
@@ -32,3 +37,4 @@ branches:
   only:
     - master
     - develop
+    - feature/fine-grained-authorization

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 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.4
 **Improvement**
 * Optimized the PSR-4 autoload configuration

composer.json

@@ -29,7 +29,7 @@
     "jms/translation-bundle": "~1.3.0",
     "guzzlehttp/guzzle": "^6",
     "surfnet/stepup-bundle": "~4.0",
-    "surfnet/stepup-middleware-client-bundle": "^2.4",
+    "surfnet/stepup-middleware-client-bundle": "^3.0",
     "surfnet/stepup-saml-bundle": "^4.1",
     "surfnet/stepup-u2f-bundle": "dev-develop",
     "mopa/composer-bridge": "~1.5",

composer.json.travis

@@ -0,0 +1,97 @@
+{
+  "name": "surfnet/stepup-selfservice",
+  "license": "Apache-2.0",
+  "description": "The SURFnet Step-up Self-Service allows Gateway users to create Identities and Tokens.",
+  "autoload": {
+    "psr-4": {
+      "": "src/",
+      "Surfnet\\": "src\\Surfnet"
+    },
+    "classmap": [
+      "app/AppKernel.php",
+      "app/AppCache.php"
+    ]
+  },
+  "repositories": [
+    {
+        "package": "surfnet/stepup-middleware-client-bundle",
+        "type": "vcs",
+        "url":  "https://github.com/OpenConext/Stepup-Middleware-clientbundle.git"
+    }
+  ],
+  "minimum-stability": "stable",
+  "require": {
+    "php": "~5.6|~7.0",
+    "symfony/symfony": "3.4.*",
+    "twig/twig": "^1.35",
+    "twig/extensions": "^1.5",
+    "symfony/assetic-bundle": "~2.3",
+    "symfony/monolog-bundle": "^3.1.0",
+    "sensio/distribution-bundle": "^5.0",
+    "sensio/framework-extra-bundle": "~3.0",
+    "incenteev/composer-parameter-handler": "~2.0",
+    "nelmio/security-bundle": "~1.4",
+    "mopa/bootstrap-bundle": "^3.2",
+    "twbs/bootstrap": "^3.3.0",
+    "fortawesome/font-awesome": "~4.2.0",
+    "jms/translation-bundle": "~1.3.0",
+    "guzzlehttp/guzzle": "^6",
+    "surfnet/stepup-bundle": "~4.0",
+    "surfnet/stepup-middleware-client-bundle": "dev-feature/fine-grained-authorization",
+    "surfnet/stepup-saml-bundle": "^4.1",
+    "surfnet/stepup-u2f-bundle": "dev-develop",
+    "mopa/composer-bridge": "~1.5",
+    "openconext/monitor-bundle": "^1.0",
+    "mpdf/mpdf": "^7.0"
+  },
+  "require-dev": {
+    "matthiasnoback/symfony-config-test": "^2.2",
+    "mockery/mockery": "~1.0",
+    "phpmd/phpmd": "^2.6",
+    "phpunit/phpunit": "^5.7",
+    "sebastian/exporter": "~2.0",
+    "sensiolabs/security-checker": "^3.0",
+    "sebastian/phpcpd": "^2.0",
+    "squizlabs/php_codesniffer": "^1.0",
+    "symfony/phpunit-bridge": "^3.0"
+  },
+  "scripts": {
+    "post-install-cmd": [
+      "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles"
+    ],
+    "post-update-cmd": [
+      "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
+      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles"
+    ]
+  },
+  "config": {
+    "optimize-autoloader": true
+  },
+  "extra": {
+    "symfony-app-dir": "app",
+    "symfony-var-dir": "app",
+    "symfony-bin-dir": "app",
+    "symfony-web-dir": "web",
+    "symfony-assets-install": "symlink",
+    "incenteev-parameters": [
+      {
+        "file": "app/config/parameters.yml"
+      },
+      {
+        "file": "app/config/samlstepupproviders_parameters.yml"
+      },
+      {
+        "file": "app/config/global_view_parameters.yml"
+      }
+    ]
+  }
+}