Projects/nettsiden
Projects/nettsiden
8
2
Fork 0
Code Issues 15 Pull Requests 2 Activity

Update dependencies and dist files

Browse Source
This commit is contained in:
Peder Bergebakken Sundt 2018-03-05 19:20:22 +01:00
parent 9fec2d56f4
commit 3117f466b5
4 changed files with 345 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

380
composer.lock generated
View File

@ -4,9 +4,173 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "bb9526f4307712d731a88758f3903639",
"content-hash": "eff76bfaa958c3f30a87781731812450",
"packages": [
{
"name": "gettext/gettext",
"version": "v3.6.1",
"source": {
"type": "git",
"url": "https://github.com/oscarotero/Gettext.git",
"reference": "cd3be64443551e3a693117c4bccbe53e36282456"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/oscarotero/Gettext/zipball/cd3be64443551e3a693117c4bccbe53e36282456",
"reference": "cd3be64443551e3a693117c4bccbe53e36282456",
"shasum": ""
},
"require": {
"gettext/languages": "2.*",
"php": ">=5.3.0"
},
"require-dev": {
"illuminate/view": "*",
"symfony/yaml": "~2",
"twig/extensions": "*",
"twig/twig": "*"
},
"suggest": {
"illuminate/view": "Is necessary if you want to use the Blade extractor",
"symfony/yaml": "Is necessary if you want to use the Yaml extractor/generator",
"twig/extensions": "Is necessary if you want to use the Twig extractor",
"twig/twig": "Is necessary if you want to use the Twig extractor"
},
"type": "library",
"autoload": {
"psr-4": {
"Gettext\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Oscar Otero",
"email": "oom@oscarotero.com",
"homepage": "http://oscarotero.com",
"role": "Developer"
}
],
"description": "PHP gettext manager",
"homepage": "https://github.com/oscarotero/Gettext",
"keywords": [
"JS",
"gettext",
"i18n",
"mo",
"po",
"translation"
],
"time": "2016-08-01T18:09:57+00:00"
},
{
"name": "gettext/languages",
"version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/mlocati/cldr-to-gettext-plural-rules.git",
"reference": "49c39e51569963cc917a924b489e7025bfb9d8c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mlocati/cldr-to-gettext-plural-rules/zipball/49c39e51569963cc917a924b489e7025bfb9d8c7",
"reference": "49c39e51569963cc917a924b489e7025bfb9d8c7",
"shasum": ""
},
"require": {
"php": ">=5.3"
},
"require-dev": {
"phpunit/phpunit": "^4"
},
"bin": [
"bin/export-plural-rules",
"bin/export-plural-rules.php"
],
"type": "library",
"autoload": {
"psr-4": {
"Gettext\\Languages\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michele Locati",
"email": "mlocati@gmail.com",
"role": "Developer"
}
],
"description": "gettext languages with plural rules",
"homepage": "https://github.com/mlocati/cldr-to-gettext-plural-rules",
"keywords": [
"cldr",
"i18n",
"internationalization",
"l10n",
"language",
"languages",
"localization",
"php",
"plural",
"plural rules",
"plurals",
"translate",
"translations",
"unicode"
],
"time": "2017-03-23T17:02:28+00:00"
},
{
"name": "jaimeperez/twig-configurable-i18n",
"version": "v1.2",
"source": {
"type": "git",
"url": "https://github.com/jaimeperez/twig-configurable-i18n.git",
"reference": "75d4926fd102c9e62219ad7f94a6136d2f2ccd93"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jaimeperez/twig-configurable-i18n/zipball/75d4926fd102c9e62219ad7f94a6136d2f2ccd93",
"reference": "75d4926fd102c9e62219ad7f94a6136d2f2ccd93",
"shasum": ""
},
"require": {
"twig/extensions": "^1.3"
},
"type": "project",
"autoload": {
"psr-4": {
"JaimePerez\\TwigConfigurableI18n\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1"
],
"authors": [
{
"name": "Jaime Perez",
"email": "jaime.perez@uninett.no"
}
],
"description": "This is an extension on top of Twig's i18n extension, allowing you to customize which functions to use for translations.",
"keywords": [
"extension",
"gettext",
"i18n",
"internationalization",
"translation",
"twig"
],
"time": "2016-10-03T12:34:15+00:00"
},
{
"name": "psr/log",
"version": "1.0.2",
@ -52,34 +216,33 @@
"psr",
"psr-3"
],
"time": "2016-10-10 12:19:37"
"time": "2016-10-10T12:19:37+00:00"
},
{
"name": "robrichards/xmlseclibs",
"version": "1.4.2",
"version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/robrichards/xmlseclibs.git",
"reference": "79fb5e03c4ee4dc3ec77e4b2628231374364a017"
"reference": "d937712f70f93a584eb0299ccd87dc6374003781"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/79fb5e03c4ee4dc3ec77e4b2628231374364a017",
"reference": "79fb5e03c4ee4dc3ec77e4b2628231374364a017",
"url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/d937712f70f93a584eb0299ccd87dc6374003781",
"reference": "d937712f70f93a584eb0299ccd87dc6374003781",
"shasum": ""
},
"require": {
"php": ">= 5.2"
"php": ">= 5.4"
},
"suggest": {
"ext/mcrypt": "MCrypt extension",
"ext/openssl": "OpenSSL extension"
"ext-openssl": "OpenSSL extension"
},
"type": "library",
"autoload": {
"classmap": [
"src/"
]
"psr-4": {
"RobRichards\\XMLSecLibs\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@ -93,47 +256,55 @@
"xml",
"xmldsig"
],
"time": "2016-09-08 13:31:44"
"time": "2017-08-31T09:27:07+00:00"
},
{
"name": "simplesamlphp/saml2",
"version": "v1.9.1",
"version": "v3.1.4",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/saml2.git",
"reference": "2a2bd4398257cbe72251c68348be72707cc77262"
"reference": "4f6af7f69f29df8555a18b9bb7b646906b45924d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/2a2bd4398257cbe72251c68348be72707cc77262",
"reference": "2a2bd4398257cbe72251c68348be72707cc77262",
"url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/4f6af7f69f29df8555a18b9bb7b646906b45924d",
"reference": "4f6af7f69f29df8555a18b9bb7b646906b45924d",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-openssl": "*",
"php": ">=5.3.3",
"ext-zlib": "*",
"php": ">=5.4",
"psr/log": "~1.0",
"robrichards/xmlseclibs": "^1.3"
"robrichards/xmlseclibs": "^3.0"
},
"require-dev": {
"mockery/mockery": "~0.9",
"phpmd/phpmd": "~1.5",
"phpunit/phpunit": "~3.7",
"satooshi/php-coveralls": "~0.6.1",
"sebastian/phpcpd": "~1.4",
"sensiolabs/security-checker": "~1.1",
"squizlabs/php_codesniffer": "~1.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "v3.0.x-dev"
}
},
"autoload": {
"psr-0": {
"SAML2_": "src/"
}
"SAML2\\": "src/"
},
"files": [
"src/_autoload.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1"
"LGPL-2.1-or-later"
],
"authors": [
{
@ -142,20 +313,20 @@
}
],
"description": "SAML2 PHP library from SimpleSAMLphp",
"time": "2016-12-02 12:45:13"
"time": "2018-03-02T14:30:38+00:00"
},
{
"name": "simplesamlphp/simplesamlphp",
"version": "v1.14.12",
"version": "v1.15.4",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/simplesamlphp.git",
"reference": "353a77be570b29f42812a44245947b4fb030a5da"
"reference": "c770d0cd392ba8d8b12ac6214dcabd818d7cca32"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/simplesamlphp/simplesamlphp/zipball/353a77be570b29f42812a44245947b4fb030a5da",
"reference": "353a77be570b29f42812a44245947b4fb030a5da",
"url": "https://api.github.com/repos/simplesamlphp/simplesamlphp/zipball/c770d0cd392ba8d8b12ac6214dcabd818d7cca32",
"reference": "c770d0cd392ba8d8b12ac6214dcabd818d7cca32",
"shasum": ""
},
"require": {
@ -163,24 +334,28 @@
"ext-dom": "*",
"ext-hash": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-pcre": "*",
"ext-spl": "*",
"ext-zlib": "*",
"php": ">=5.3",
"robrichards/xmlseclibs": "~1.4.1",
"simplesamlphp/saml2": "~1.9.1",
"gettext/gettext": "^3.5",
"jaimeperez/twig-configurable-i18n": "^1.2",
"php": ">=5.4",
"robrichards/xmlseclibs": "~3.0",
"simplesamlphp/saml2": "~3.1.4",
"twig/twig": "~1.0",
"whitehat101/apr1-md5": "~1.0"
},
"require-dev": {
"ext-pdo_sqlite": "*",
"phpunit/phpunit": "~3.7",
"satooshi/php-coveralls": "^1.0"
"mikey179/vfsstream": "~1.6",
"phpunit/phpunit": "~4.8"
},
"type": "project",
"autoload": {
"psr-0": {
"SimpleSAML": "lib/"
"psr-4": {
"SimpleSAML\\": "lib/SimpleSAML"
},
"files": [
"lib/_autoload_modules.php"
@ -188,7 +363,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1"
"LGPL-2.1-or-later"
],
"authors": [
{
@ -198,21 +373,144 @@
{
"name": "Andreas Åkre Solberg",
"email": "andreas.solberg@uninett.no"
},
{
"name": "Jaime Perez",
"email": "jaime.perez@uninett.no"
}
],
"description": "A PHP implementation of SAML 2.0 service provider and identity provider functionality. And is also compatible with Shibboleth 1.3 and 2.0.",
"description": "A PHP implementation of a SAML 2.0 service provider and identity provider, also compatible with Shibboleth 1.3 and 2.0.",
"homepage": "http://simplesamlphp.org",
"keywords": [
"OpenId",
"SAML2",
"aselect",
"idp",
"oauth",
"shibboleth",
"sp",
"ws-federation"
],
"time": "2017-03-30 12:11:17"
"time": "2018-03-02T15:02:24+00:00"
},
{
"name": "twig/extensions",
"version": "v1.5.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig-extensions.git",
"reference": "d188c76168b853481cc75879ea045bf93d718e9c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/d188c76168b853481cc75879ea045bf93d718e9c",
"reference": "d188c76168b853481cc75879ea045bf93d718e9c",
"shasum": ""
},
"require": {
"twig/twig": "~1.27|~2.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~3.3@dev",
"symfony/translation": "~2.3|~3.0"
},
"suggest": {
"symfony/translation": "Allow the time_diff output to be translated"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.5-dev"
}
},
"autoload": {
"psr-0": {
"Twig_Extensions_": "lib/"
},
"psr-4": {
"Twig\\Extensions\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "Common additional features for Twig that do not directly belong in core",
"homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
"keywords": [
"i18n",
"text"
],
"time": "2017-06-08T18:19:53+00:00"
},
{
"name": "twig/twig",
"version": "v1.35.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "9c24f2cd39dc1906b76879e099970b7e53724601"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/9c24f2cd39dc1906b76879e099970b7e53724601",
"reference": "9c24f2cd39dc1906b76879e099970b7e53724601",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~3.3@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.35-dev"
}
},
"autoload": {
"psr-0": {
"Twig_": "lib/"
},
"psr-4": {
"Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Armin Ronacher",
"email": "armin.ronacher@active-4.com",
"role": "Project Founder"
},
{
"name": "Twig Team",
"homepage": "http://twig.sensiolabs.org/contributors",
"role": "Contributors"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
"homepage": "http://twig.sensiolabs.org",
"keywords": [
"templating"
],
"time": "2018-03-03T16:21:29+00:00"
},
{
"name": "whitehat101/apr1-md5",
@ -256,7 +554,7 @@
"MD5",
"apr1"
],
"time": "2015-02-11 11:06:42"
"time": "2015-02-11T11:06:42+00:00"
}
],
"packages-dev": [],

2
dist/authsources_example.php vendored
View File

@ -4,6 +4,6 @@ $config = array(
/* This is the name of this authentication source, and will be used to access it later. */
'default-sp' => array(
'saml:SP',
'idp' => 'https://www.pvv.ntnu.no/idp',
'idp' => 'https://idp.pvv.ntnu.no/',
),
);

10
dist/saml20-idp-remote.php vendored
View File

@ -1,13 +1,13 @@
<?php
$metadata['https://www.pvv.ntnu.no/idp'] = array (
$metadata['https://idp.pvv.ntnu.no/'] = array (
'metadata-set' => 'saml20-idp-remote',
'entityid' => 'https://www.pvv.ntnu.no/idp',
'entityid' => 'https://idp.pvv.ntnu.no/',
'SingleSignOnService' =>
array (
0 =>
array (
'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
'Location' => 'https://www.pvv.ntnu.no/idp/saml2/idp/SSOService.php',
'Location' => 'https://idp.pvv.ntnu.no/simplesaml/saml2/idp/SSOService.php',
),
),
'SingleLogoutService' =>
@ -15,9 +15,9 @@ $metadata['https://www.pvv.ntnu.no/idp'] = array (
0 =>
array (
'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
'Location' => 'https://www.pvv.ntnu.no/idp/saml2/idp/SingleLogoutService.php',
'Location' => 'https://idp.pvv.ntnu.no/simplesaml/saml2/idp/SingleLogoutService.php',
),
),
'certData' => 'MIICgDCCAemgAwIBAgIJAP13Q5w2R3KgMA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNVBAYTAk5PMRgwFgYDVQQIFA9Tw7hyLVRyw7huZGVsYWcxDDAKBgNVBAoTA1BWVjAeFw0xNDAzMTMxODIzNTVaFw0yNDAzMTIxODIzNTVaMDUxCzAJBgNVBAYTAk5PMRgwFgYDVQQIFA9Tw7hyLVRyw7huZGVsYWcxDDAKBgNVBAoTA1BWVjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzckfyofefuJr/gDl0vj7gbIGiwXD825c3YidWK2Cg37ZmSycVk3mng4OqZkQbKY8wRaHg/fruqicDhodCPq9dF7/+QmYAG8PMKmpCIvnKaT7EjOGQtCnxv2+17CF0c7IuLjlwNZG8m0xDBZZp8ymj6QK+mJfVEahBPbkMaCBGIsCAwEAAaOBlzCBlDAdBgNVHQ4EFgQUNEuP7yZVDneEA4uTfJv/UFA9gjcwZQYDVR0jBF4wXIAUNEuP7yZVDneEA4uTfJv/UFA9gjehOaQ3MDUxCzAJBgNVBAYTAk5PMRgwFgYDVQQIFA9Tw7hyLVRyw7huZGVsYWcxDDAKBgNVBAoTA1BWVoIJAP13Q5w2R3KgMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAg8hx8aRy/Fz9PK9UckOQ92WSoRCyr/ldQSf0OTRTMyG+zsSrzVsDX3+BFWbMAFrEu7SZAakd9FQajTUw0d930iaDP+ptX1uIxb64OOY0glLOW3Ru/CL309JwUIkDADa8drpRK4IFDvzs5nVpaj75X1pp583e+psuNST8f+mLspw=',
'certData' => 'MIIDpTCCAo2gAwIBAgIJAJIgibrB7NvsMA0GCSqGSIb3DQEBCwUAMGkxCzAJBgNVBAYTAk5PMR4wHAYDVQQKDBVQcm9ncmFtdmFyZXZlcmtzdGVkZXQxGDAWBgNVBAMMD2lkcC5wdnYubnRudS5ubzEgMB4GCSqGSIb3DQEJARYRZHJpZnRAcHZ2Lm50bnUubm8wHhcNMTcxMTEzMjI0NTQyWhcNMjcxMTEzMjI0NTQyWjBpMQswCQYDVQQGEwJOTzEeMBwGA1UECgwVUHJvZ3JhbXZhcmV2ZXJrc3RlZGV0MRgwFgYDVQQDDA9pZHAucHZ2Lm50bnUubm8xIDAeBgkqhkiG9w0BCQEWEWRyaWZ0QHB2di5udG51Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAveLujCsgVCRA360y5yezy8FcSPhaqodggDqY12UTkYOMQLBFaph6uUL4oCUlXZqxScrAYVRt9yw+7BYpcm0p51VZzVCsfMxRVkn+O1eUvsaXq3f13f87QHKYP2f0uqkGf5PvnKIdSaI/ix8WJhD8XT+h0OkHEcaBvUtSG7zbEhvG21WPHwgw2rvZSneArQ8tOitZC0u8VXSfdhtf6ynRseo0xC95634UwQAZivhQ2v4A6Tp57QG5DCXIJ9/z3PkINx3KB/hOeh0EP6Dpbp+7V0/t9778E3whpm4llrH144kzROhA7EgUgkZOjAVjxGCYlcj3xQPnnItihVOZ5B5qLwIDAQABo1AwTjAdBgNVHQ4EFgQUPLhrB+Qb/Kzz7Car9GJkKmEkz6swHwYDVR0jBBgwFoAUPLhrB+Qb/Kzz7Car9GJkKmEkz6swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAd+4E6t0j8/p8rbZE8y/gZ9GsiRhxkR4l6JbMRUfEpqHKi415qstChRcP2Lo3Yd5qdmj9tLDWoPsqet1QgyTTmQTgUmPhhMOQDqSh90LuqEJseKWafXGS/SfWLH6MWVmzDV5YofJEw2ThPiU58GiS06OLS2poq1eAesa2LQ22J8yYisXM4sxImIFte+LYQ1+1evfBWcvU1vrGsQ0VLJHdef9WoXp1swUFhq4Zk0c7gjHiB1CFVlExAAlk9L6W3CVXmKIYlf4eUnEBGkC061Ir42+uhAMWO9Y/L1NEuboTyd2KAI/6JdKdzpmfk7zPVxWlNxNCZ7OPNuvOKp6VlpB2EA==',
'NameIDFormat' => 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient',
);

29
pvv.sql
View File

@ -1,29 +0,0 @@
CREATE TABLE "events" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"name" TEXT,
"start" TEXT,
"stop" TEXT,
"organiser" TEXT,
"location" TEXT,
"description" TEXT
);
CREATE TABLE "projects" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"name" TEXT,
"owner" TEXT,
"owneruname" TEXT,
"owneremail" TEXT,
"description" TEXT,
"active" BOOLEAN
);
CREATE TABLE "users" (
"uname" TEXT,
"groups" INT DEFAULT 0
);
CREATE TABLE "motd" (
"title" TEXT,
"content" TEXT
);