Skip to content

FOUR-21491 - Disable script executors unless CUSTOM_EXECUTORS=true #7901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 2 commits into from
Jan 23, 2025
Merged

FOUR-21491 - Disable script executors unless CUSTOM_EXECUTORS=true #7901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6d665
Disable script executors unless CUSTOM_EXECUTORS=true
nolanpro Jan 14, 2025
7858255
Merge branch 'release-2025-winter' into feature/FOUR-21491
ryancooley Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,6 @@ OPEN_AI_SECRET="sk-O2D..."
AI_MICROSERVICE_HOST="http://localhost:8010"
PROCESS_REQUEST_ERRORS_RATE_LIMIT=1
PROCESS_REQUEST_ERRORS_RATE_LIMIT_DURATION=86400
CUSTOM_EXECUTORS=false
CACHE_SETTING_DRIVER=cache_settings
CACHE_SETTING_PREFIX=settings
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/ScriptExecutorController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ class ScriptExecutorController extends Controller
{
public function index(Request $request)
{
if (!config('app.custom_executors')) {
abort(404);
}

return view('admin.script-executors.index');
}
}
4 changes: 4 additions & 0 deletions ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@ public function delete(Request $request, ScriptExecutor $scriptExecutor)

private function checkAuth($request)
{
if (!config('app.custom_executors')) {
abort(404);
}

if (!$request->user()->is_administrator) {
throw new AuthorizationException();
}
Expand Down
10 changes: 6 additions & 4 deletions ProcessMaker/Http/Middleware/GenerateMenus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,12 @@ public function handle(Request $request, Closure $next)
'icon' => 'fa-infinity',
]);

$submenu->add(__('Script Executors'), [
'route' => 'script-executors.index',
'icon' => 'fa-code',
]);
if (config('app.custom_executors')) {
$submenu->add(__('Script Executors'), [
'route' => 'script-executors.index',
'icon' => 'fa-code',
]);
}

$devlinkIcon = base64_encode(file_get_contents(base_path('resources/img/devlink.svg')));
$submenu->add(__('DevLink'), [
Expand Down
3 changes: 3 additions & 0 deletions config/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,10 @@
'vault_transit_key' => env('ENCRYPTED_DATA_VAULT_TRANSIT_KEY', ''),
],

'custom_executors' => env('CUSTOM_EXECUTORS', false),

'prometheus_namespace' => env('PROMETHEUS_NAMESPACE', 'processmaker'),

'server_timing' => [
'enabled' => env('SERVER_TIMING_ENABLED', true),
'min_package_time' => env('SERVER_TIMING_MIN_PACKAGE_TIME', 5), // Minimum time in milliseconds
Expand Down