devol
/
LinkStack
mirror of https://github.com/LinkStackOrg/LinkStack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved validation 

bugfixes
This commit is contained in:
Julian Prieber 2024-02-07 19:15:30 +01:00
parent 9f06ef68c0
commit 1c43aa8422
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/UserController.php
View File

@ -200,7 +200,7 @@ class UserController extends Controller
public function saveLink(request $request) public function saveLink(request $request)
{ {
$request->validate([ $request->validate([
'link' => 'sometimes|url', 'link' => 'sometimes|exturl',
]); ]);
$linkType = LinkType::find($request->linktype_id); $linkType = LinkType::find($request->linktype_id);
@ -476,7 +476,7 @@ class UserController extends Controller
} }
if(empty($links->button_id)) { if(empty($links->button_id)) {
return redirect(route('showButtons')); die; throw new \Exception('Invalid link');
} }
$links->save(); $links->save();
@ -715,7 +715,7 @@ class UserController extends Controller
public function editLink(request $request) public function editLink(request $request)
{ {
$request->validate([ $request->validate([
'link' => 'required|url', 'link' => 'required|exturl',
'title' => 'required', 'title' => 'required',
'button' => 'required', 'button' => 'required',
]); ]);
@ -1055,7 +1055,7 @@ class UserController extends Controller
public function delProfilePicture() public function delProfilePicture()
{ {
$userId = Auth::user()->id; $userId = Auth::user()->id;
// Delete the user's current avatar if it exists // Delete the user's current avatar if it exists
while (findAvatar($userId) !== "error.error") { while (findAvatar($userId) !== "error.error") {
$avatarName = findAvatar($userId); $avatarName = findAvatar($userId);
@ -1154,10 +1154,11 @@ class UserController extends Controller
$user->littlelink_description = $sanitizedText; $user->littlelink_description = $sanitizedText;
} }
$allowedExtensions = array('jpeg', 'jpg', 'png', 'webp');
$userExtension = strtolower($userData['image_extension']);
if (isset($userData['image_data'])) { if (isset($userData['image_data'])) {
$allowedExtensions = array('jpeg', 'jpg', 'png', 'webp');
$userExtension = strtolower($userData['image_extension']);
if (in_array($userExtension, $allowedExtensions)) { if (in_array($userExtension, $allowedExtensions)) {
// Decode the image data from Base64 // Decode the image data from Base64
$imageData = base64_decode($userData['image_data']); $imageData = base64_decode($userData['image_data']);
@ -1186,11 +1187,11 @@ class UserController extends Controller
foreach ($userData['links'] as $linkData) { foreach ($userData['links'] as $linkData) {
$validatedData = Validator::make($linkData, [ $validatedData = Validator::make($linkData, [
'link' => 'nullable|url', 'link' => 'nullable|exturl',
]); ]);
if ($validatedData->fails()) { if ($validatedData->fails()) {
throw new \Exception('Invalid link'); print_r($linkData); die;
} }
$newLink = new Link(); $newLink = new Link();
@ -1222,7 +1223,6 @@ class UserController extends Controller
// Save the new link to the database // Save the new link to the database
$newLink->save(); $newLink->save();
} }
return redirect('studio/profile')->with('success', __('messages.Profile updated successfully!')); return redirect('studio/profile')->with('success', __('messages.Profile updated successfully!'));
} catch (\Exception $e) { } catch (\Exception $e) {
return redirect('studio/profile')->with('error', __('messages.An error occurred while updating your profile.')); return redirect('studio/profile')->with('error', __('messages.An error occurred while updating your profile.'));
@ -1252,7 +1252,7 @@ class UserController extends Controller
$validationRules = []; $validationRules = [];
foreach ($inputKeys as $platform) { foreach ($inputKeys as $platform) {
$validationRules[$platform] = 'nullable|url|max:255'; $validationRules[$platform] = 'nullable|exturl|max:255';
} }
$request->validate($validationRules); $request->validate($validationRules);

4
app/Providers/AppServiceProvider.php
View File

@ -37,5 +37,9 @@ class AppServiceProvider extends ServiceProvider
return $query->count() === 0; return $query->count() === 0;
}); });
Validator::extend('exturl', function ($attribute, $value, $parameters, $validator) {
$allowed_schemes = ['http', 'https', 'mailto', 'tel'];
return in_array(parse_url($value, PHP_URL_SCHEME), $allowed_schemes, true);
});
} }
} }