API user creation behing a toggle

I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled. Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information. I've moved all the internal settings definition to config to avoid duplicated place to define them. I don't know why we didn't did that earlier.
author: Jeremy Benoist <jeremy.benoist@gmail.com> 2017-06-02 10:19:33 +0200
committer: Jeremy Benoist <jeremy.benoist@gmail.com> 2017-06-02 11:32:38 +0200
commit: 426bb453d295900fb3e35dce2f9081a42639cf27 (patch)
tree: 77fc6aedf17640a9d13a817e25fbd06ab89b471f /app/config
parent: a687c8d915276eee0c0494156700f7d0c0606735 (diff)
download: wallabag-426bb453d295900fb3e35dce2f9081a42639cf27.tar.gz
wallabag-426bb453d295900fb3e35dce2f9081a42639cf27.tar.zst
wallabag-426bb453d295900fb3e35dce2f9081a42639cf27.zip
2 files changed, 130 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 04f8547d..b0d330ab 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -62,6 +62,135 @@ wallabag_core:
    fetching_error_message: |
        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
    api_limit_mass_actions: 10
+    default_internal_settings:
+        -
+            name: share_public
+            value: 1
+            section: entry
+        -
+            name: carrot
+            value: 1
+            section: entry
+        -
+            name: share_diaspora
+            value: 1
+            section: entry
+        -
+            name: diaspora_url
+            value: http://diasporapod.com
+            section: entry
+        -
+            name: share_unmark
+            value: 1
+            section: entry
+        -
+            name: unmark_url
+            value: https://unmark.it
+            section: entry
+        -
+            name: share_shaarli
+            value: 1
+            section: entry
+        -
+            name: share_scuttle
+            value: 1
+            section: entry
+        -
+            name: shaarli_url
+            value: http://myshaarli.com
+            section: entry
+        -
+            name: scuttle_url
+            value: http://scuttle.org
+            section: entry
+        -
+            name: share_mail
+            value: 1
+            section: entry
+        -
+            name: share_twitter
+            value: 1
+            section: entry
+        -
+            name: show_printlink
+            value: 1
+            section: entry
+        -
+            name: restricted_access
+            value: 0
+            section: entry
+        -
+            name: export_epub
+            value: 1
+            section: export
+        -
+            name: export_mobi
+            value: 1
+            section: export
+        -
+            name: export_pdf
+            value: 1
+            section: export
+        -
+            name: export_csv
+            value: 1
+            section: export
+        -
+            name: export_json
+            value: 1
+            section: export
+        -
+            name: export_txt
+            value: 1
+            section: export
+        -
+            name: export_xml
+            value: 1
+            section: export
+        -
+            name: import_with_redis
+            value: 0
+            section: import
+        -
+            name: import_with_rabbitmq
+            value: 0
+            section: import
+        -
+            name: piwik_enabled
+            value: 0
+            section: analytics
+        -
+            name: piwik_host
+            value: v2.wallabag.org
+            section: analytics
+        -
+            name: piwik_site_id
+            value: 1
+            section: analytics
+        -
+            name: demo_mode_enabled
+            value: 0
+            section: misc
+        -
+            name: demo_mode_username
+            value: wallabag
+            section: misc
+        -
+            name: download_images_enabled
+            value: 0
+            section: misc
+        -
+            name: wallabag_support_url
+            value: https://www.wallabag.org/pages/support.html
+            section: misc
+        -
+            name: wallabag_url
+            value: http://v2.wallabag.org
+            section: misc
+        -
+            name: api_user_registration
+            value: 0
+            section: api
 wallabag_user:
    registration_enabled: "%fosuser_registration%"
diff --git a/app/config/security.yml b/app/config/security.yml
index efb00a53..ffb1d356 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -56,6 +56,7 @@ security:
    access_control:
        - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/api/user, roles: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
author	Jeremy Benoist <jeremy.benoist@gmail.com>	2017-06-02 10:19:33 +0200
committer	Jeremy Benoist <jeremy.benoist@gmail.com>	2017-06-02 11:32:38 +0200
commit	426bb453d295900fb3e35dce2f9081a42639cf27 (patch)
tree	77fc6aedf17640a9d13a817e25fbd06ab89b471f /app/config
parent	a687c8d915276eee0c0494156700f7d0c0606735 (diff)
download	wallabag-426bb453d295900fb3e35dce2f9081a42639cf27.tar.gz wallabag-426bb453d295900fb3e35dce2f9081a42639cf27.tar.zst wallabag-426bb453d295900fb3e35dce2f9081a42639cf27.zip

diff --git a/app/config/config.yml b/app/config/config.yml index 04f8547d..b0d330ab 100644 --- a/app/config/config.yml +++ b/app/config/config.yml
@@ -62,6 +62,135 @@ wallabag_core:
62	fetching_error_message: \|	62	fetching_error_message: \|
63	wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.	63	wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
64	api_limit_mass_actions: 10	64	api_limit_mass_actions: 10
		65	default_internal_settings:
		66	-
		67	name: share_public
		68	value: 1
		69	section: entry
		70	-
		71	name: carrot
		72	value: 1
		73	section: entry
		74	-
		75	name: share_diaspora
		76	value: 1
		77	section: entry
		78	-
		79	name: diaspora_url
		80	value: http://diasporapod.com
		81	section: entry
		82	-
		83	name: share_unmark
		84	value: 1
		85	section: entry
		86	-
		87	name: unmark_url
		88	value: https://unmark.it
		89	section: entry
		90	-
		91	name: share_shaarli
		92	value: 1
		93	section: entry
		94	-
		95	name: share_scuttle
		96	value: 1
		97	section: entry
		98	-
		99	name: shaarli_url
		100	value: http://myshaarli.com
		101	section: entry
		102	-
		103	name: scuttle_url
		104	value: http://scuttle.org
		105	section: entry
		106	-
		107	name: share_mail
		108	value: 1
		109	section: entry
		110	-
		111	name: share_twitter
		112	value: 1
		113	section: entry
		114	-
		115	name: show_printlink
		116	value: 1
		117	section: entry
		118	-
		119	name: restricted_access
		120	value: 0
		121	section: entry
		122	-
		123	name: export_epub
		124	value: 1
		125	section: export
		126	-
		127	name: export_mobi
		128	value: 1
		129	section: export
		130	-
		131	name: export_pdf
		132	value: 1
		133	section: export
		134	-
		135	name: export_csv
		136	value: 1
		137	section: export
		138	-
		139	name: export_json
		140	value: 1
		141	section: export
		142	-
		143	name: export_txt
		144	value: 1
		145	section: export
		146	-
		147	name: export_xml
		148	value: 1
		149	section: export
		150	-
		151	name: import_with_redis
		152	value: 0
		153	section: import
		154	-
		155	name: import_with_rabbitmq
		156	value: 0
		157	section: import
		158	-
		159	name: piwik_enabled
		160	value: 0
		161	section: analytics
		162	-
		163	name: piwik_host
		164	value: v2.wallabag.org
		165	section: analytics
		166	-
		167	name: piwik_site_id
		168	value: 1
		169	section: analytics
		170	-
		171	name: demo_mode_enabled
		172	value: 0
		173	section: misc
		174	-
		175	name: demo_mode_username
		176	value: wallabag
		177	section: misc
		178	-
		179	name: download_images_enabled
		180	value: 0
		181	section: misc
		182	-
		183	name: wallabag_support_url
		184	value: https://www.wallabag.org/pages/support.html
		185	section: misc
		186	-
		187	name: wallabag_url
		188	value: http://v2.wallabag.org
		189	section: misc
		190	-
		191	name: api_user_registration
		192	value: 0
		193	section: api
65		194
66	wallabag_user:	195	wallabag_user:
67	registration_enabled: "%fosuser_registration%"	196	registration_enabled: "%fosuser_registration%"


diff --git a/app/config/security.yml b/app/config/security.yml index efb00a53..ffb1d356 100644 --- a/app/config/security.yml +++ b/app/config/security.yml
@@ -56,6 +56,7 @@ security:
56	access_control:	56	access_control:
57	- { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }	57	- { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
58	- { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY }	58	- { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY }
		59	- { path: ^/api/user, roles: IS_AUTHENTICATED_ANONYMOUSLY }
59	- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }	60	- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
60	- { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }	61	- { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
61	- { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }	62	- { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }