merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4699 from devansh-webkul/s-3 

SVG Image Sanitization Done - SA3
This commit is contained in:
Glenn Hermans 2021-03-02 08:51:10 +01:00 committed by GitHub
parent e56182b37e 82a56761c8
commit 4451465938
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 118 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -25,6 +25,7 @@
"barryvdh/laravel-debugbar": "^3.1",
"barryvdh/laravel-dompdf": "0.8.6",
"doctrine/dbal": "2.9.2",
"enshrined/svg-sanitize": "^0.14.0",
"fideloper/proxy": "^4.2",
"flynsarmy/db-blade-compiler": "^5.5",
"fzaninotto/faker": "^1.4",

47
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "a3b2fd5de3b2c9728194478b97a6b6e1",
"content-hash": "62aa6739c921ce53f0029598eb1ada41",
"packages": [
{
"name": "algolia/algoliasearch-client-php",
@ -1506,6 +1506,51 @@
},
"time": "2021-02-11T11:04:51+00:00"
},
{
"name": "enshrined/svg-sanitize",
"version": "0.14.0",
"source": {
"type": "git",
"url": "https://github.com/darylldoyle/svg-sanitizer.git",
"reference": "beff89576a72540ee99476aeb9cfe98222e76fb8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/beff89576a72540ee99476aeb9cfe98222e76fb8",
"reference": "beff89576a72540ee99476aeb9cfe98222e76fb8",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*"
},
"require-dev": {
"codeclimate/php-test-reporter": "^0.1.2",
"phpunit/phpunit": "^6"
},
"type": "library",
"autoload": {
"psr-4": {
"enshrined\\svgSanitize\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Daryll Doyle",
"email": "daryll@enshrined.co.uk"
}
],
"description": "An SVG sanitizer for PHP",
"support": {
"issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
"source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.14.0"
},
"time": "2021-01-21T10:13:20+00:00"
},
{
"name": "ezimuel/guzzlestreams",
"version": "3.0.1",

27
packages/Webkul/Core/src/Traits/Sanitizer.php Normal file
View File

@ -0,0 +1,27 @@
<?php
namespace Webkul\Core\Traits;
use Illuminate\Support\Facades\Storage;
use enshrined\svgSanitize\Sanitizer as MainSanitizer;
trait Sanitizer
{
/**
* Sanitize SVG file.
*
* @param string $path
* @return void
*/
public function sanitizeSVG($path)
{
/* sanitizer instance */
$sanitizer = new MainSanitizer();
/* grab svg file */
$dirtySVG = Storage::get($path);
/* save sanitized svg */
Storage::put($path, $sanitizer->sanitize($dirtySVG));
}
}

11
packages/Webkul/Product/src/Repositories/SearchRepository.php
View File

@ -2,13 +2,16 @@
namespace Webkul\Product\Repositories;
use Illuminate\Container\Container as App;
use Illuminate\Support\Facades\Storage;
use Webkul\Core\Traits\Sanitizer;
use Webkul\Core\Eloquent\Repository;
use Illuminate\Support\Facades\Storage;
use Illuminate\Container\Container as App;
use Webkul\Product\Repositories\ProductRepository;
class SearchRepository extends Repository
{
use Sanitizer;
/**
* ProductRepository object
*
@ -51,6 +54,10 @@ class SearchRepository extends Repository
{
$path = request()->file('image')->store('product-search');
if ($data['image']->getMimeType() === 'image/svg') {
$this->sanitizeSVG($path);
}
return Storage::url($path);
}
}

86
packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
View File

@ -2,18 +2,14 @@
namespace Webkul\Velocity\Http\Controllers\Admin;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Webkul\Core\Traits\Sanitizer;
use Illuminate\Support\Facades\Storage;
use Webkul\Velocity\Repositories\VelocityMetadataRepository;
class ConfigurationController extends Controller
{
/**
* VelocityMetadataRepository object
*
* @var \Webkul\Velocity\Repositories\VelocityMetadataRepository
*/
protected $velocityMetaDataRepository;
use Sanitizer;
/**
* Locale
@ -25,6 +21,13 @@ class ConfigurationController extends Controller
*/
protected $channel;
/**
* VelocityMetadataRepository $velocityMetaDataRepository
*
* @var \Webkul\Velocity\Repositories\VelocityMetadataRepository
*/
protected $velocityMetaDataRepository;
/**
* Create a new controller instance.
*
@ -43,12 +46,14 @@ class ConfigurationController extends Controller
}
/**
* Render meta data.
*
* @return \Illuminate\View\View
*/
public function renderMetaData()
{
{
$this->locale = request()->get('locale') ? request()->get('locale') : app()->getLocale();
$velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale, $this->channel, false);
if (! $velocityMetaData) {
@ -65,6 +70,8 @@ class ConfigurationController extends Controller
}
/**
* Store meta data.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
@ -105,16 +112,6 @@ class ConfigurationController extends Controller
}
}
if (isset($params['product_view_images'])) {
foreach ($params['product_view_images'] as $index => $productViewImage) {
if ($productViewImage !== "") {
$params['product_view_images'][$index] = $this->uploadImage($productViewImage, $index);
}
}
$params['product_view_images'] = json_encode($params['product_view_images']);
}
$params['advertisement'] = json_encode($params['advertisement']);
$params['home_page_content'] = str_replace('=&gt;', '=>', $params['home_page_content']);
@ -132,10 +129,11 @@ class ConfigurationController extends Controller
}
/**
* Upload advertisement images.
*
* @param array $data
* @param int $index
* @param array $advertisement
*
* @return array
*/
public function uploadAdvertisementImages($data, $index, $advertisement)
@ -152,16 +150,20 @@ class ConfigurationController extends Controller
if (Str::contains($imageId, 'image_')) {
if (request()->hasFile($file) && $image) {
$filter_index = substr($imageId, 6, 1);
if ( isset($data[$filter_index]) ) {
if (isset($data[$filter_index])) {
$size = array_key_last($saveData[$index]);
$saveImage[$size + 1] = request()->file($file)->store($dir);
$saveImage[$size + 1] = $path = request()->file($file)->store($dir);
} else {
$saveImage[substr($imageId, 6, 1)] = request()->file($file)->store($dir);
$saveImage[substr($imageId, 6, 1)] = $path = request()->file($file)->store($dir);
}
if ($image->getMimeType() === 'image/svg') {
$this->sanitizeSVG($path);
}
}
} else {
if ( isset($advertisement[$index][$imageId]) && $advertisement[$index][$imageId] && !request()->hasFile($file)) {
if (isset($advertisement[$index][$imageId]) && $advertisement[$index][$imageId] && !request()->hasFile($file)) {
$saveImage[$imageId] = $advertisement[$index][$imageId];
unset($advertisement[$index][$imageId]);
@ -200,30 +202,8 @@ class ConfigurationController extends Controller
}
/**
* @param array $data
* @param int $index
* Manage add images.
*
* @return mixed
*/
public function uploadImage($data, $index)
{
$type = 'product_view_images';
$request = request();
$image = '';
$file = $type . '.' . $index;
$dir = "velocity/$type";
if ($request->hasFile($file)) {
Storage::delete($dir . $file);
$image = $request->file($file)->store($dir);
}
return $image;
}
/**
* @param array $addImages
*
* @return array
@ -250,21 +230,25 @@ class ConfigurationController extends Controller
return $imagePaths;
}
/**
* Create meta data.
*
* @param string $locale
* @param string $channel
*
* @return array
*/
private function createMetaData($locale, $channel)
{
\DB::table('velocity_meta_data')->insert([
'locale' => $locale,
'channel' => $channel,
'header_content_count' => '5',
'home_page_content' => "<p>@include('shop::home.advertisements.advertisement-four')@include('shop::home.featured-products') @include('shop::home.product-policy') @include('shop::home.advertisements.advertisement-three') @include('shop::home.new-products') @include('shop::home.advertisements.advertisement-two')</p>",
'footer_left_content' => __('velocity::app.admin.meta-data.footer-left-raw-content'),
'footer_middle_content' => '<div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="{!! url(\'page/about-us\') !!}">About Us</a></li><li><a href="{!! url(\'page/cutomer-service\') !!}">Customer Service</a></li><li><a href="{!! url(\'page/whats-new\') !!}">What&rsquo;s New</a></li><li><a href="{!! url(\'page/contact-us\') !!}">Contact Us </a></li></ul></div><div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="{!! url(\'page/return-policy\') !!}"> Order and Returns </a></li><li><a href="{!! url(\'page/payment-policy\') !!}"> Payment Policy </a></li><li><a href="{!! url(\'page/shipping-policy\') !!}"> Shipping Policy</a></li><li><a href="{!! url(\'page/privacy-policy\') !!}"> Privacy and Cookies Policy </a></li></ul></div>',
'slider' => 1,
'subscription_bar_content' => '<div class="social-icons col-lg-6"><a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-facebook" title="facebook"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-twitter" title="twitter"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-linked-in" title="linkedin"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-youtube" title="Youtube"></i> </a> <a href="https://webkul.com" target="_blank" class="unset" rel="noopener noreferrer"><i class="fs24 within-circle rango-instagram" title="instagram"></i></a></div>',
'product_policy' => '<div class="row col-12 remove-padding-margin"><div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shipping on Order $20 or More</span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Replace &amp; Return Available </span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Exchange and EMI Available </span></div></div></div></div></div>',
]);
}

13
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -205,19 +205,6 @@
@include('shop::products.view.related-products')
@include('shop::products.view.up-sells')
</div>
<div class="store-meta-images col-3">
@if(
isset($velocityMetaData['product_view_images'])
&& $velocityMetaData['product_view_images']
)
@foreach (json_decode($velocityMetaData['product_view_images'], true) as $image)
@if ($image && $image !== '')
<img src="{{ url()->to('/') }}/storage/{{ $image }}" alt=""/>
@endif
@endforeach
@endif
</div>
</div>
{!! view_render_event('bagisto.shop.products.view.after', ['product' => $product]) !!}
@endsection