Skip to content

Commit 8def8f6

Browse files
committed
Revert "Add example for plugin_user"
This reverts commit cac786e.
1 parent cac786e commit 8def8f6

File tree

3 files changed

+24
-46
lines changed

3 files changed

+24
-46
lines changed

manifest.master.yml

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,6 @@ extensions:
8181
- type: "value"
8282
value: "%info.json%"
8383

84-
dump/plugin_user:
85-
plugin_user:
86-
# reference a plugin defined baseconfig
87-
base_config: "user.api_user"
88-
exec:
89-
service: "python3"
90-
commands:
91-
- prog: "python3"
92-
stdin:
93-
type: "body"
94-
stdout:
95-
type: "body"
96-
args:
97-
- type: "value"
98-
value: "%_exec.pluginDir%/server/extension/plugin_user.py"
99-
- type: "value"
100-
value: "%info.json%"
101-
10284
dump/error:
10385
exec:
10486
service: "node"
@@ -382,8 +364,6 @@ callbacks:
382364
- type: "value"
383365
value: "%_exec.pluginDir%/server/validation_errors/validation_errors.js"
384366
bounce:
385-
plugin_user:
386-
optional: true
387367
exec:
388368
service: "node"
389369
commands:
@@ -493,7 +473,6 @@ collection_upload:
493473
# value: "%_exec.pluginDir%/server/collection/filename_copy/config_check.js"
494474

495475
# base config extension. These parameters will be accessible via /api/config.
496-
497476
base_config:
498477
- name: comment
499478
parameters:
@@ -506,10 +485,6 @@ base_config:
506485
type: bool
507486
data:
508487
type: json
509-
- name: user
510-
parameters:
511-
api_user:
512-
type: user
513488

514489
system_rights:
515490
- name: example_right
@@ -541,6 +516,29 @@ system_rights:
541516
- name: preview-versions
542517
type: preview-versions
543518

519+
# hook for the plugin scheduler
520+
scheduler:
521+
# name of this scheduler plugin
522+
example: # "task"
523+
plugin_user:
524+
# set to true to require a plugin user to be set in the plugin manager
525+
require: true
526+
callbacks:
527+
run:
528+
exec:
529+
service: "python3"
530+
commands:
531+
- prog: "python3"
532+
stdin:
533+
type: body
534+
stdout:
535+
type: body
536+
args:
537+
- type: "value"
538+
value: "%_exec.pluginDir%/server/scheduled/example.py"
539+
- type: "value"
540+
value: "%info.json%"
541+
544542
custom_types:
545543
example:
546544
mapping:

server/extension/plugin_user.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

server/extension/signature.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def check_sig(headers, hname, body):
99
m = re.match('(sha(1|256))=([0-9a-f]+)', h)
1010
if not m:
1111
return "invalid header format: " + h
12-
12+
1313
hhash = hmac.new(
1414
SECRET.encode('utf-8'),
1515
body.encode('utf-8'),

0 commit comments

Comments
 (0)