Skip to content

Commit dd629c4

Browse files
snipeFlorentDotMe
authored andcommitted
Fixed grokability#15366 - use permission for encrypted custom fields
Signed-off-by: snipe <[email protected]>
1 parent 5dcc6d6 commit dd629c4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/Http/Controllers/Api/AssetsController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ public function store(StoreAssetRequest $request): JsonResponse
602602
if ($field->field_encrypted == '1') {
603603
Log::debug('This model field is encrypted in this fieldset.');
604604

605-
if (Gate::allows('admin')) {
605+
if (Gate::allows('assets.view.encrypted_custom_fields')) {
606606

607607
// If input value is null, use custom field's default value
608608
if (($field_val == null) && ($request->has('model_id') != '')) {
@@ -695,7 +695,7 @@ public function update(UpdateAssetRequest $request, Asset $asset): JsonResponse
695695
}
696696
}
697697
if ($field->field_encrypted == '1') {
698-
if (Gate::allows('admin')) {
698+
if (Gate::allows('assets.view.encrypted_custom_fields')) {
699699
$field_val = Crypt::encrypt($field_val);
700700
} else {
701701
$problems_updating_encrypted_custom_fields = true;

app/Http/Controllers/Assets/AssetsController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function store(ImageUploadRequest $request) : RedirectResponse
165165
if (($model) && ($model->fieldset)) {
166166
foreach ($model->fieldset->fields as $field) {
167167
if ($field->field_encrypted == '1') {
168-
if (Gate::allows('admin')) {
168+
if (Gate::allows('assets.view.encrypted_custom_fields')) {
169169
if (is_array($request->input($field->db_column))) {
170170
$asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
171171
} else {
@@ -388,7 +388,7 @@ public function update(ImageUploadRequest $request, $assetId = null) : RedirectR
388388
foreach ($model->fieldset->fields as $field) {
389389

390390
if ($field->field_encrypted == '1') {
391-
if (Gate::allows('admin')) {
391+
if (Gate::allows('assets.view.encrypted_custom_fields')) {
392392
if (is_array($request->input($field->db_column))) {
393393
$asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
394394
} else {

0 commit comments

Comments
 (0)