hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update authentication configuration

Browse Source
This commit is contained in:
Romain Neutron
2013-05-06 19:07:51 +02:00
parent 4dd46cd4e8
commit cbc3fd981f
7 changed files with 296 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
config/config.sample.yml
View File

@@ -32,37 +32,38 @@ dev:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
facebook: providers:
enabled: false facebook:
options: enabled: false
app-id: '' options:
secret: '' app-id: ''
twitter: secret: ''
enabled: false twitter:
options: enabled: false
consumer-key: '' options:
consumer-secret: '' consumer-key: ''
google-plus: consumer-secret: ''
enabled: false google-plus:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
github: client-secret: ''
enabled: false github:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
viadeo: client-secret: ''
enabled: false viadeo:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
linkedin: client-secret: ''
enabled: false linkedin:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
client-secret: ''
registration-fields: registration-fields:
- -
name: company name: company
@@ -92,37 +93,38 @@ prod:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
facebook: providers:
enabled: false facebook:
options: enabled: false
app-id: '' options:
secret: '' app-id: ''
twitter: secret: ''
enabled: false twitter:
options: enabled: false
consumer-key: '' options:
consumer-secret: '' consumer-key: ''
google-plus: consumer-secret: ''
enabled: false google-plus:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
github: client-secret: ''
enabled: false github:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
viadeo: client-secret: ''
enabled: false viadeo:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
linkedin: client-secret: ''
enabled: false linkedin:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
client-secret: ''
registration-fields: registration-fields:
- -
name: company name: company
@@ -152,37 +154,38 @@ test:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
facebook: providers:
enabled: false facebook:
options: enabled: false
app-id: '' options:
secret: '' app-id: ''
twitter: secret: ''
enabled: false twitter:
options: enabled: false
consumer-key: '' options:
consumer-secret: '' consumer-key: ''
google-plus: consumer-secret: ''
enabled: false google-plus:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
github: client-secret: ''
enabled: false github:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
viadeo: client-secret: ''
enabled: false viadeo:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
linkedin: client-secret: ''
enabled: false linkedin:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
client-secret: ''
registration-fields: registration-fields:
- -
name: company name: company

16
config/connexions.sample.yml
View File

@@ -2,15 +2,15 @@
#Please refer to Doctrine documentation abstraction layer for database connection configuration #Please refer to Doctrine documentation abstraction layer for database connection configuration
#DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html #DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html
#Define a connexion to MYSQL database named main_connexion #Defines a connexion to MYSQL database named main_connexion
main_connexion: main_connexion:
host: <HOSTNAME> host: <HOSTNAME>
port: <PORT> port: <PORT>
user: <USERNAME> user: <USERNAME>
password: <PASSWORD> password: <PASSWORD>
dbname: <DATABASE_NAME> dbname: <DATABASE_NAME>
driver: pdo_mysql driver: pdo_mysql
charset: UTF8 charset: UTF8
#Define a connexion to a SQLite database named test_connexion #Define a connexion to a SQLite database named test_connexion
test_connexion: test_connexion:

82
config/services.sample.yml
View File

@@ -154,47 +154,47 @@ Border:
#Enable validation on incoming files #Enable validation on incoming files
enabled: true enabled: true
checkers: checkers:
#Check for duplicated file based on their sha256 check sum #Check for duplicated file based on their sha256 check sum
- -
type: Checker\Sha256 type: Checker\Sha256
enabled: true enabled: true
#Check for duplicated file based on their UUID #Check for duplicated file based on their UUID
- -
type: Checker\UUID type: Checker\UUID
enabled: true enabled: true
#Check colorspace (if applicable) #Check colorspace (if applicable)
- -
type: Checker\Colorspace type: Checker\Colorspace
enabled: false enabled: false
options: options:
colorspaces: [cmyk, grayscale, rgb] colorspaces: [cmyk, grayscale, rgb]
#Check file dimension (if applicable) #Check file dimension (if applicable)
- -
type: Checker\Dimension type: Checker\Dimension
enabled: false enabled: false
options: options:
width: 80 width: 80
height: 160 height: 160
#Check file extension #Check file extension
#set to false to enable all file extensions #set to false to enable all file extensions
- -
type: Checker\Extension type: Checker\Extension
enabled: false enabled: false
options: options:
extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2] extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2]
#Check filename #Check filename
- -
type: Checker\Filename type: Checker\Filename
enabled: false enabled: false
options: options:
sensitive: true sensitive: true
#Check media type #Check media type
#Set to false to enable all mediatype #Set to false to enable all mediatype
- -
type: Checker\MediaType type: Checker\MediaType
enabled: false enabled: false
options: options:
mediatypes: [Audio, Document, Flash, Image, Video] mediatypes: [Audio, Document, Flash, Image, Video]
SearchEngine: SearchEngine:
phrasea: phrasea:
type: SearchEngine\PhraseaEngine type: SearchEngine\PhraseaEngine

3
lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php
View File

@@ -53,7 +53,8 @@ class AuthenticationManagerServiceProvider implements ServiceProviderInterface
$providers = new ProvidersCollection(); $providers = new ProvidersCollection();
foreach ($app['phraseanet.configuration']->get('auth-providers') as $providerId => $data) { $authConf = $app['phraseanet.configuration']->get('authentication');
foreach ($authConf['providers'] as $providerId => $data) {
if (isset($data['enabled']) && false === $data['enabled']) { if (isset($data['enabled']) && false === $data['enabled']) {
continue; continue;
} }

189
lib/conf.d/config.yml
View File

@@ -31,37 +31,38 @@ dev:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
facebook: providers:
enabled: false facebook:
options: enabled: false
app-id: '' options:
secret: '' app-id: ''
twitter: secret: ''
enabled: false twitter:
options: enabled: false
consumer-key: '' options:
consumer-secret: '' consumer-key: ''
google-plus: consumer-secret: ''
enabled: false google-plus:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
github: client-secret: ''
enabled: false github:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
viadeo: client-secret: ''
enabled: false viadeo:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
linkedin: client-secret: ''
enabled: false linkedin:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
client-secret: ''
registration-fields: registration-fields:
- -
name: company name: company
@@ -91,37 +92,38 @@ prod:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
facebook: providers:
enabled: false facebook:
options: enabled: false
app-id: '' options:
secret: '' app-id: ''
twitter: secret: ''
enabled: false twitter:
options: enabled: false
consumer-key: '' options:
consumer-secret: '' consumer-key: ''
google-plus: consumer-secret: ''
enabled: false google-plus:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
github: client-secret: ''
enabled: false github:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
viadeo: client-secret: ''
enabled: false viadeo:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
linkedin: client-secret: ''
enabled: false linkedin:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
client-secret: ''
registration-fields: registration-fields:
- -
name: company name: company
@@ -151,37 +153,38 @@ test:
border-manager: border_manager border-manager: border_manager
search-engine: phrasea search-engine: phrasea
task-manager: task_manager task-manager: task_manager
auth-providers: authentication:
facebook: providers:
enabled: false facebook:
options: enabled: false
app-id: '' options:
secret: '' app-id: ''
twitter: secret: ''
enabled: false twitter:
options: enabled: false
consumer-key: '' options:
consumer-secret: '' consumer-key: ''
google-plus: consumer-secret: ''
enabled: false google-plus:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
github: client-secret: ''
enabled: false github:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
viadeo: client-secret: ''
enabled: false viadeo:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
linkedin: client-secret: ''
enabled: false linkedin:
options: enabled: false
client-id: '' options:
client-secret: '' client-id: ''
client-secret: ''
registration-fields: registration-fields:
- -
name: company name: company

24
lib/conf.d/connexions.yml
View File

@@ -2,18 +2,18 @@
#Please refer to Doctrine documentation abstraction layer for database connection configuration #Please refer to Doctrine documentation abstraction layer for database connection configuration
#DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html #DBAL connection : http://www.doctrine-project.org/docs/dbal/2.1/en/reference/configuration.html
#Define a connexion to MYSQL database named main_connexion #Defines a connexion to MYSQL database named main_connexion
main_connexion: main_connexion:
host: <HOSTNAME> host: <HOSTNAME>
port: <PORT> port: <PORT>
user: <USERNAME> user: <USERNAME>
password: <PASSWORD> password: <PASSWORD>
dbname: <DATABASE_NAME> dbname: <DATABASE_NAME>
driver: pdo_mysql driver: pdo_mysql
charset: UTF8 charset: UTF8
#Define a connexion to a SQLite database named test_connexion #Defines a connexion to a SQLite database named test_connexion
test_connexion: test_connexion:
driver: pdo_sqlite driver: pdo_sqlite
path: '/tmp/db.sqlite' path: '/tmp/db.sqlite'
charset: UTF8 charset: UTF8

82
lib/conf.d/services.yml
View File

@@ -154,47 +154,47 @@ Border:
#Enable validation on incoming files #Enable validation on incoming files
enabled: true enabled: true
checkers: checkers:
#Check for duplicated file based on their sha256 check sum #Check for duplicated file based on their sha256 check sum
- -
type: Checker\Sha256 type: Checker\Sha256
enabled: true enabled: true
#Check for duplicated file based on their UUID #Check for duplicated file based on their UUID
- -
type: Checker\UUID type: Checker\UUID
enabled: true enabled: true
#Check colorspace (if applicable) #Check colorspace (if applicable)
- -
type: Checker\Colorspace type: Checker\Colorspace
enabled: false enabled: false
options: options:
colorspaces: [cmyk, grayscale, rgb] colorspaces: [cmyk, grayscale, rgb]
#Check file dimension (if applicable) #Check file dimension (if applicable)
- -
type: Checker\Dimension type: Checker\Dimension
enabled: false enabled: false
options: options:
width: 80 width: 80
height: 160 height: 160
#Check file extension #Check file extension
#set to false to enable all file extensions #set to false to enable all file extensions
- -
type: Checker\Extension type: Checker\Extension
enabled: false enabled: false
options: options:
extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2] extensions: [jpg, jpeg, bmp, tif, gif, png, pdf, doc, odt, mpg, mpeg, mov, avi, xls, flv, mp3, mp2]
#Check filename #Check filename
- -
type: Checker\Filename type: Checker\Filename
enabled: false enabled: false
options: options:
sensitive: true sensitive: true
#Check media type #Check media type
#Set to false to enable all mediatype #Set to false to enable all mediatype
- -
type: Checker\MediaType type: Checker\MediaType
enabled: false enabled: false
options: options:
mediatypes: [Audio, Document, Flash, Image, Video] mediatypes: [Audio, Document, Flash, Image, Video]
SearchEngine: SearchEngine:
phrasea: phrasea:
type: SearchEngine\PhraseaEngine type: SearchEngine\PhraseaEngine