fix secret for version

This commit is contained in:
Damodar Lohani
2022-03-29 11:46:54 +00:00
parent 2c00148431
commit 33100df180
4 changed files with 6 additions and 9 deletions
+3 -6
View File
@@ -988,10 +988,9 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
$secrets = $project->getAttribute('storageSecrets');
$displacement = $project->getAttribute('storageSecretsDisplacement', 0);
$version = $displacement + \count($secrets);
$data = json_decode($data, true);
$version = ($data['version'] ?? 1) - $displacement;
$key = $secrets[$version];
$key = $secrets[$version - 1];
$source = OpenSSL::decrypt($data['data'], $data['method'], $key, 0, hex2bin($data['iv']), hex2bin($data['tag']));
@@ -1154,10 +1153,9 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
$secrets = $project->getAttribute('storageSecrets');
$displacement = $project->getAttribute('storageSecretsDisplacement', 0);
$version = $displacement + \count($secrets);
$data = json_decode($data, true);
$version = ($data['version'] ?? 1) - $displacement;
$key = $secrets[$version];
$key = $secrets[$version - 1];
$source = OpenSSL::decrypt($data['data'], $data['method'], $key, 0, hex2bin($data['iv']), hex2bin($data['tag']));
}
@@ -1315,10 +1313,9 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
$secrets = $project->getAttribute('storageSecrets');
$displacement = $project->getAttribute('storageSecretsDisplacement', 0);
$version = $displacement + \count($secrets);
$data = json_decode($data, true);
$version = ($data['version'] ?? 1) - $displacement;
$key = $secrets[$version];
$key = $secrets[$version - 1];
$source = OpenSSL::decrypt($data['data'], $data['method'], $key, 0, hex2bin($data['iv']), hex2bin($data['tag']));
}
+1 -1
View File
@@ -825,7 +825,7 @@ App::setResource('dbForProject', function($db, $cache, $project) {
$value = json_decode($value, true);
$version = ($value['version'] ?? 1) - $displacement;
$key = $secrets[$version];
$key = $secrets[$version - 1];
return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
}
+1 -1
View File
@@ -556,7 +556,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
$value = json_decode($value, true);
$version = ($value['version'] ?? 1) - $displacement;
$key = $secrets[$version];
$key = $secrets[$version - 1];
return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
}
+1 -1
View File
@@ -252,7 +252,7 @@ abstract class Worker
$value = json_decode($value, true);
$version = ($value['version'] ?? 1) - $displacement;
$key = $secrets[$version];
$key = $secrets[$version - 1];
return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
}