entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 34 Releases Activity

misc: send Publik-Caller-URL header to passerelle (#83114) #812

Merged
ecazenave merged 1 commits from wip/83114-publik-caller into main 2023-11-10 11:34:00 +01:00
Conversation 0 Commits 1 Files Changed 5 +139 -10
ecazenave commented 2023-11-03 18:03:36 +01:00
Owner
Copy Link
No description provided.
fpeters reviewed 2023-11-04 15:44:48 +01:00
wcs/qommon/misc.py Outdated
@ -355,0 +355,4 @@
def add_publik_caller_url(url, headers):
passerelle_url = get_publisher().get_site_option('passerelle_url', 'variables')
if not passerelle_url or not url.startswith(passerelle_url):
return
fpeters commented 2023-11-04 15:42:16 +01:00
Owner
Copy Link

Je ne limiterais pas à passerelle, si on trouve utile de limiter quand même, que ça soit quand même élargi à tous les services publik.

Je ne limiterais pas à passerelle, si on trouve utile de limiter quand même, que ça soit quand même élargi à tous les services publik.
ecazenave commented 2023-11-07 17:02:40 +01:00
Author
Owner
Copy Link

Maintenant que tu le dis ça me va bien aussi de ne mettre aucune limite.

Maintenant que tu le dis ça me va bien aussi de ne mettre aucune limite.
wcs/wscalls.py Outdated
@ -145,6 +145,7 @@ def call_webservice(
url = sign_url(url, signature_key)
headers = {'Accept': 'application/json'}
add_publik_caller_url(url, headers)
fpeters commented 2023-11-04 15:44:19 +01:00
Owner
Copy Link

Il me semble que c'est redondant de l'avoir ici, que le _http_request plus haut va être appelé de toute façon.

Il me semble que c'est redondant de l'avoir ici, que le _http_request plus haut va être appelé de toute façon.
ecazenave commented 2023-11-07 17:03:00 +01:00
Author
Owner
Copy Link

Effectivement, corrigé.

Effectivement, corrigé.
ecazenave force-pushed wip/83114-publik-caller from 2a516cae8b to f902df039b 2023-11-07 12:38:29 +01:00 Compare
ecazenave force-pushed wip/83114-publik-caller from f902df039b to d52aa1849c 2023-11-07 14:55:47 +01:00 Compare
ecazenave force-pushed wip/83114-publik-caller from d52aa1849c to a30a7ab2c9 2023-11-07 15:57:40 +01:00 Compare
ecazenave force-pushed wip/83114-publik-caller from a30a7ab2c9 to 983f6d3635 2023-11-07 16:23:16 +01:00 Compare
ecazenave force-pushed wip/83114-publik-caller from 983f6d3635 to b1df52cccb 2023-11-07 16:44:51 +01:00 Compare
ecazenave reviewed 2023-11-07 17:04:27 +01:00
tests/test_misc.py Outdated
@ -40,6 +40,7 @@ from .utilities import clean_temporary_pub, create_temporary_pub, get_app
def setup_module(module):
cleanup()
create_temporary_pub()
ecazenave commented 2023-11-07 17:04:27 +01:00
Author
Owner
Copy Link

Sinon le get_publisher().substitutions.get_context_variables().get('form') échoue.

Ça me parait être une situation artificielle du test, donc j'adapte le test.

Sinon le `get_publisher().substitutions.get_context_variables().get('form')` échoue. Ça me parait être une situation artificielle du test, donc j'adapte le test.
fpeters commented 2023-11-07 17:06:01 +01:00
Owner
Copy Link

Plutôt ajouter une fixture pub, comme la plupart des autres modules.

Plutôt ajouter une fixture pub, comme la plupart des autres modules.
ecazenave commented 2023-11-09 16:21:12 +01:00
Author
Owner
Copy Link

Voilà.

Voilà.
ecazenave changed title from WIP: misc: send Publik-Caller-URL header to passerelle (#83114) to misc: send Publik-Caller-URL header to passerelle (#83114) 2023-11-07 17:05:23 +01:00
ecazenave force-pushed wip/83114-publik-caller from b1df52cccb to 1979a74e2a 2023-11-09 15:42:36 +01:00 Compare
fpeters approved these changes 2023-11-10 10:10:37 +01:00
fpeters left a comment
Owner
Copy Link

Mais ok.

Mais ok.
wcs/qommon/misc.py Outdated
@ -359,0 +361,4 @@
if form:
headers['Publik-Caller-URL'] = form._formdef.get_admin_url()
if form._formdata.id:
headers['Publik-Caller-URL'] = form.backoffice_url
fpeters commented 2023-11-10 10:10:31 +01:00
Owner
Copy Link

J'aurais plutôt posé form._formdata.get_backoffice_url(), même si ça revient au même. (pour faciliter le grep là-dessus).

J'aurais plutôt posé form._formdata.get_backoffice_url(), même si ça revient au même. (pour faciliter le grep là-dessus).
ecazenave force-pushed wip/83114-publik-caller from 1979a74e2a to fad1bb2ec2 2023-11-10 10:58:15 +01:00 Compare
ecazenave merged commit 2df16b82f0 into main 2023-11-10 11:34:00 +01:00
ecazenave deleted branch wip/83114-publik-caller 2023-11-10 11:34:00 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
fpeters
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: entrouvert/wcs#812
No description provided.
Delete Branch "wip/83114-publik-caller"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?