mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-14 09:34:10 -08:00
296de34e8a
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials
155 lines
5.5 KiB
PHP
155 lines
5.5 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Licenses;
|
|
|
|
use App\Http\Controllers\Controller;
|
|
use App\Http\Requests\AssetFileRequest;
|
|
use App\Models\Actionlog;
|
|
use App\Models\License;
|
|
use Illuminate\Support\Facades\Input;
|
|
use Illuminate\Support\Facades\Response;
|
|
use Illuminate\Support\Facades\Storage;
|
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
|
|
|
class LicenseFilesController extends Controller
|
|
{
|
|
|
|
/**
|
|
* Validates and stores files associated with a license.
|
|
*
|
|
* @todo Switch to using the AssetFileRequest form request validator.
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v1.0]
|
|
* @param AssetFileRequest $request
|
|
* @param int $licenseId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function store(AssetFileRequest $request, $licenseId = null)
|
|
{
|
|
$license = License::find($licenseId);
|
|
// the license is valid
|
|
$destinationPath = config('app.private_uploads').'/licenses';
|
|
|
|
if (isset($license->id)) {
|
|
$this->authorize('update', $license);
|
|
|
|
if (Request::hasFile('file')) {
|
|
|
|
if (!Storage::exists('private_uploads/licenses')) Storage::makeDirectory('private_uploads/licenses', 775);
|
|
|
|
$upload_success = false;
|
|
foreach (Input::file('file') as $file) {
|
|
$extension = $file->getClientOriginalExtension();
|
|
$file_name = 'license-'.$license->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
|
|
|
|
$upload_success = Storage::put('private_uploads/licenses/'.$file_name, $file);
|
|
|
|
//Log the upload to the log
|
|
$license->logUpload($file_name, e($request->input('notes')));
|
|
}
|
|
|
|
// This being called from a modal seems to confuse redirect()->back()
|
|
// It thinks we should go to the dashboard. As this is only used
|
|
// from the modal at present, hardcode the redirect. Longterm
|
|
// maybe we evaluate something else.
|
|
if ($upload_success) {
|
|
return redirect()->route('licenses.show', $license->id)->with('success', trans('admin/licenses/message.upload.success'));
|
|
}
|
|
return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.error'));
|
|
}
|
|
return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.nofiles'));
|
|
}
|
|
// Prepare the error message
|
|
return redirect()->route('licenses.index')
|
|
->with('error', trans('admin/licenses/message.does_not_exist'));
|
|
}
|
|
|
|
|
|
/**
|
|
* Deletes the selected license file.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v1.0]
|
|
* @param int $licenseId
|
|
* @param int $fileId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function destroy($licenseId = null, $fileId = null)
|
|
{
|
|
$license = License::find($licenseId);
|
|
|
|
// the asset is valid
|
|
if (isset($license->id)) {
|
|
$this->authorize('update', $license);
|
|
$log = Actionlog::find($fileId);
|
|
|
|
// Remove the file if one exists
|
|
if (Storage::exists('licenses/'.$log->filename)) {
|
|
try {
|
|
Storage::delete('licenses/'.$log->filename);
|
|
} catch (\Exception $e) {
|
|
\Log::debug($e);
|
|
}
|
|
}
|
|
|
|
$log->delete();
|
|
return redirect()->back()
|
|
->with('success', trans('admin/hardware/message.deletefile.success'));
|
|
}
|
|
|
|
// Redirect to the licence management page
|
|
return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* Allows the selected file to be viewed.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v1.4]
|
|
* @param int $licenseId
|
|
* @param int $fileId
|
|
* @return \Symfony\Component\HttpFoundation\Response
|
|
* @throws \Illuminate\Auth\Access\AuthorizationException
|
|
*/
|
|
public function show($licenseId = null, $fileId = null, $download = true)
|
|
{
|
|
|
|
$license = License::find($licenseId);
|
|
|
|
// the license is valid
|
|
if (isset($license->id)) {
|
|
$this->authorize('view', $license);
|
|
|
|
if (!$log = Actionlog::find($fileId)) {
|
|
return response('No matching record for that asset/file', 500)
|
|
->header('Content-Type', 'text/plain');
|
|
}
|
|
|
|
$file = 'private_uploads/licenses/'.$log->filename;
|
|
\Log::debug('Checking for '.$file);
|
|
|
|
if (!Storage::exists($file)) {
|
|
return response('File '.$file.' not found on server', 404)
|
|
->header('Content-Type', 'text/plain');
|
|
}
|
|
|
|
if ($download != 'true') {
|
|
if ($contents = file_get_contents(Storage::url($file))) {
|
|
return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
|
|
}
|
|
return JsonResponse::create(["error" => "Failed validation: "], 500);
|
|
}
|
|
return Storage::download($file);
|
|
}
|
|
return redirect()->route('hardware.index')->with('error', trans('admin/licenses/message.does_not_exist', ['id' => $fileId]));
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|