webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Added permission system

Browse Source
This commit is contained in:
Dan Brown
2015-08-29 15:03:42 +01:00
parent 0513239c25
commit ae95d0a239
24 changed files with 519 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/BookController.php
View File

@ -26,6 +26,7 @@ class BookController extends Controller
{
$this->bookRepo = $bookRepo;
$this->pageRepo = $pageRepo;
parent::__construct();
}
/**
@ -46,19 +47,21 @@ class BookController extends Controller
*/
public function create()
{
$this->checkPermission('book-create');
return view('books/create');
}
/**
* Store a newly created book in storage.
*
* @param Request $request
* @param Request $request
* @return Response
*/
public function store(Request $request)
{
$this->checkPermission('book-create');
$this->validate($request, [
'name' => 'required|string|max:255',
'name' => 'required|string|max:255',
'description' => 'string|max:1000'
]);
$book = $this->bookRepo->newFromInput($request->all());
@ -90,6 +93,7 @@ class BookController extends Controller
*/
public function edit($slug)
{
$this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($slug);
return view('books/edit', ['book' => $book, 'current' => $book]);
}
@ -98,14 +102,15 @@ class BookController extends Controller
* Update the specified book in storage.
*
* @param Request $request
* @param $slug
* @param $slug
* @return Response
*/
public function update(Request $request, $slug)
{
$this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($slug);
$this->validate($request, [
'name' => 'required|string|max:255',
'name' => 'required|string|max:255',
'description' => 'string|max:1000'
]);
$book->fill($request->all());
@ -123,6 +128,7 @@ class BookController extends Controller
*/
public function showDelete($bookSlug)
{
$this->checkPermission('book-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
return view('books/delete', ['book' => $book, 'current' => $book]);
}
@ -135,6 +141,7 @@ class BookController extends Controller
*/
public function destroy($bookSlug)
{
$this->checkPermission('book-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
Activity::addMessage('book_delete', 0, $book->name);
$this->bookRepo->destroyBySlug($bookSlug);

21
app/Http/Controllers/ChapterController.php
View File

@ -22,12 +22,13 @@ class ChapterController extends Controller
* @param $bookRepo
* @param $chapterRepo
*/
public function __construct(BookRepo $bookRepo,ChapterRepo $chapterRepo)
public function __construct(BookRepo $bookRepo, ChapterRepo $chapterRepo)
{
$this->bookRepo = $bookRepo;
$this->chapterRepo = $chapterRepo;
parent::__construct();
}
/**
* Show the form for creating a new chapter.
@ -37,6 +38,7 @@ class ChapterController extends Controller
*/
public function create($bookSlug)
{
$this->checkPermission('chapter-create');
$book = $this->bookRepo->getBySlug($bookSlug);
return view('chapters/create', ['book' => $book, 'current' => $book]);
}
@ -44,12 +46,13 @@ class ChapterController extends Controller
/**
* Store a newly created chapter in storage.
*
* @param $bookSlug
* @param $bookSlug
* @param Request $request
* @return Response
*/
public function store($bookSlug, Request $request)
{
$this->checkPermission('chapter-create');
$this->validate($request, [
'name' => 'required|string|max:255'
]);
@ -88,6 +91,7 @@ class ChapterController extends Controller
*/
public function edit($bookSlug, $chapterSlug)
{
$this->checkPermission('chapter-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
@ -97,12 +101,13 @@ class ChapterController extends Controller
* Update the specified chapter in storage.
*
* @param Request $request
* @param $bookSlug
* @param $chapterSlug
* @param $bookSlug
* @param $chapterSlug
* @return Response
*/
public function update(Request $request, $bookSlug, $chapterSlug)
{
$this->checkPermission('chapter-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
$chapter->fill($request->all());
@ -121,6 +126,7 @@ class ChapterController extends Controller
*/
public function showDelete($bookSlug, $chapterSlug)
{
$this->checkPermission('chapter-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
@ -135,10 +141,11 @@ class ChapterController extends Controller
*/
public function destroy($bookSlug, $chapterSlug)
{
$this->checkPermission('chapter-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
if(count($chapter->pages) > 0) {
foreach($chapter->pages as $page) {
if (count($chapter->pages) > 0) {
foreach ($chapter->pages as $page) {
$page->chapter_id = 0;
$page->save();
}

48
app/Http/Controllers/Controller.php
View File

@ -2,27 +2,69 @@
namespace Oxbow\Http\Controllers;
use HttpRequestException;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Exception\HttpResponseException;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
use Oxbow\User;
abstract class Controller extends BaseController
{
use DispatchesJobs, ValidatesRequests;
/**
* @var User static
*/
protected $currentUser;
/**
* @var bool
*/
protected $signedIn;
/**
* Controller constructor.
*/
public function __construct()
{
view()->share('signedIn', Auth::check());
// Get a user instance for the current user
$user = Auth::user();
if(!$user) {
if (!$user) {
$user = User::getDefault();
}
view()->share('user', $user);
// Share variables with views
view()->share('signedIn', Auth::check());
view()->share('currentUser', $user);
// Share variables with controllers
$this->currentUser = $user;
$this->signedIn = Auth::check();
}
/**
* Checks for a permission.
*
* @param $permissionName
* @return bool|\Illuminate\Http\RedirectResponse
*/
protected function checkPermission($permissionName)
{
if (!$this->currentUser || !$this->currentUser->can($permissionName)) {
Session::flash('error', trans('errors.permission'));
throw new HttpResponseException(
redirect()->back()
);
}
return true;
}
protected function checkPermissionOr($permissionName, $callback)
{
$callbackResult = $callback();
if ($callbackResult === false) $this->checkPermission($permissionName);
return true;
}
}

3
app/Http/Controllers/HomeController.php
View File

@ -19,12 +19,13 @@ class HomeController extends Controller
/**
* HomeController constructor.
* @param ActivityService $activityService
* @param BookRepo $bookRepo
* @param BookRepo $bookRepo
*/
public function __construct(ActivityService $activityService, BookRepo $bookRepo)
{
$this->activityService = $activityService;
$this->bookRepo = $bookRepo;
parent::__construct();
}

52
app/Http/Controllers/ImageController.php
View File

@ -18,12 +18,13 @@ class ImageController extends Controller
/**
* ImageController constructor.
* @param Image $image
* @param File $file
* @param File $file
*/
public function __construct(Image $image, File $file)
{
$this->image = $image;
$this->file = $file;
parent::__construct();
}
/**
@ -33,7 +34,7 @@ class ImageController extends Controller
*/
public function getImage(Request $request)
{
$cacheTime = 60*60*24;
$cacheTime = 60 * 60 * 24;
$path = storage_path() . '/' . $request->path();
$modifiedTime = $this->file->lastModified($path);
$eTag = md5($modifiedTime . $path);
@ -43,20 +44,20 @@ class ImageController extends Controller
$headers = [
'Last-Modified' => $headerLastModified,
'Cache-Control' => 'must-revalidate',
'Pragma' => 'public',
'Expires' => $headerExpires,
'Etag' => $eTag
'Pragma' => 'public',
'Expires' => $headerExpires,
'Etag' => $eTag
];
$browserModifiedSince = $request->header('If-Modified-Since');
$browserNoneMatch = $request->header('If-None-Match');
if($browserModifiedSince !== null && file_exists($path) && ($browserModifiedSince == $headerLastModified || $browserNoneMatch == $eTag)) {
if ($browserModifiedSince !== null && file_exists($path) && ($browserModifiedSince == $headerLastModified || $browserNoneMatch == $eTag)) {
return response()->make('', 304, $headers);
}
if(file_exists($path)) {
if (file_exists($path)) {
return response()->make(file_get_contents($path), 200, array_merge($headers, [
'Content-Type' => $this->file->mimeType($path),
'Content-Type' => $this->file->mimeType($path),
'Content-Length' => filesize($path),
]));
}
@ -72,21 +73,21 @@ class ImageController extends Controller
{
$pageSize = 30;
$images = DB::table('images')->orderBy('created_at', 'desc')
->skip($page*$pageSize)->take($pageSize)->get();
foreach($images as $image) {
->skip($page * $pageSize)->take($pageSize)->get();
foreach ($images as $image) {
$image->thumbnail = $this->getThumbnail($image, 150, 150);
}
$hasMore = count(DB::table('images')->orderBy('created_at', 'desc')
->skip(($page+1)*$pageSize)->take($pageSize)->get()) > 0;
->skip(($page + 1) * $pageSize)->take($pageSize)->get()) > 0;
return response()->json([
'images' => $images,
'images' => $images,
'hasMore' => $hasMore
]);
}
/**
* Get the thumbnail for an image.
* @param $image
* @param $image
* @param int $width
* @param int $height
* @return string
@ -99,7 +100,7 @@ class ImageController extends Controller
$thumbFilePath = public_path() . $thumbPath;
// Return the thumbnail url path if already exists
if(file_exists($thumbFilePath)) {
if (file_exists($thumbFilePath)) {
return $thumbPath;
}
@ -108,7 +109,7 @@ class ImageController extends Controller
$thumb->fit($width, $height);
// Create thumbnail folder if it does not exist
if(!file_exists(dirname($thumbFilePath))) {
if (!file_exists(dirname($thumbFilePath))) {
mkdir(dirname($thumbFilePath), 0775, true);
}
@ -124,13 +125,14 @@ class ImageController extends Controller
*/
public function upload(Request $request)
{
$this->checkPermission('image-create');
$imageUpload = $request->file('file');
$name = str_replace(' ', '-', $imageUpload->getClientOriginalName());
$storageName = substr(sha1(time()), 0, 10) . '-' . $name;
$imagePath = '/uploads/images/'.Date('Y-m-M').'/';
$storagePath = public_path(). $imagePath;
$imagePath = '/uploads/images/' . Date('Y-m-M') . '/';
$storagePath = public_path() . $imagePath;
$fullPath = $storagePath . $storageName;
while(file_exists($fullPath)) {
while (file_exists($fullPath)) {
$storageName = substr(sha1(rand()), 0, 3) . $storageName;
$fullPath = $storagePath . $storageName;
}
@ -147,12 +149,13 @@ class ImageController extends Controller
/**
* Update image details
* @param $imageId
* @param $imageId
* @param Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function update($imageId, Request $request)
{
$this->checkPermission('image-update');
$this->validate($request, [
'name' => 'required|min:2|string'
]);
@ -169,6 +172,7 @@ class ImageController extends Controller
*/
public function destroy($id)
{
$this->checkPermission('image-delete');
$image = $this->image->findOrFail($id);
// Delete files
@ -176,14 +180,14 @@ class ImageController extends Controller
$fileName = basename($image->url);
// Delete thumbnails
foreach(glob($folder . '/*') as $file) {
if(is_dir($file)) {
foreach (glob($folder . '/*') as $file) {
if (is_dir($file)) {
$thumbName = $file . '/' . $fileName;
if(file_exists($file)) {
if (file_exists($file)) {
unlink($thumbName);
}
// Remove thumb folder if empty
if(count(glob($file . '/*')) === 0) {
if (count(glob($file . '/*')) === 0) {
rmdir($file);
}
}
@ -194,7 +198,7 @@ class ImageController extends Controller
$image->delete();
// Delete parent folder if empty
if(count(glob($folder . '/*')) === 0) {
if (count(glob($folder . '/*')) === 0) {
rmdir($folder);
}
return response()->json('Image Deleted');

38
app/Http/Controllers/PageController.php
View File

@ -20,8 +20,8 @@ class PageController extends Controller
/**
* PageController constructor.
* @param PageRepo $pageRepo
* @param BookRepo $bookRepo
* @param PageRepo $pageRepo
* @param BookRepo $bookRepo
* @param ChapterRepo $chapterRepo
*/
public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo)
@ -29,18 +29,20 @@ class PageController extends Controller
$this->pageRepo = $pageRepo;
$this->bookRepo = $bookRepo;
$this->chapterRepo = $chapterRepo;
parent::__construct();
}
/**
* Show the form for creating a new page.
*
* @param $bookSlug
* @param $bookSlug
* @param bool $chapterSlug
* @return Response
* @internal param bool $pageSlug
*/
public function create($bookSlug, $chapterSlug = false)
{
$this->checkPermission('page-create');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
@ -50,14 +52,15 @@ class PageController extends Controller
* Store a newly created page in storage.
*
* @param Request $request
* @param $bookSlug
* @param $bookSlug
* @return Response
*/
public function store(Request $request, $bookSlug)
{
$this->checkPermission('page-create');
$this->validate($request, [
'name' => 'required|string|max:255',
'html' => 'required|string',
'name' => 'required|string|max:255',
'html' => 'required|string',
'parent' => 'integer|exists:pages,id'
]);
$book = $this->bookRepo->getBySlug($bookSlug);
@ -66,7 +69,7 @@ class PageController extends Controller
$page->slug = $this->pageRepo->findSuitableSlug($page->name, $book->id);
$page->priority = $this->bookRepo->getNewPriority($book);
if($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) {
if ($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) {
$page->chapter_id = $request->get('chapter');
}
@ -103,6 +106,7 @@ class PageController extends Controller
*/
public function edit($bookSlug, $pageSlug)
{
$this->checkPermission('page-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]);
@ -112,12 +116,13 @@ class PageController extends Controller
* Update the specified page in storage.
*
* @param Request $request
* @param $bookSlug
* @param $pageSlug
* @param $bookSlug
* @param $pageSlug
* @return Response
*/
public function update(Request $request, $bookSlug, $pageSlug)
{
$this->checkPermission('page-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$this->pageRepo->updatePage($page, $book->id, $request->all());
@ -145,7 +150,7 @@ class PageController extends Controller
public function searchAll(Request $request)
{
$searchTerm = $request->get('term');
if(empty($searchTerm)) return redirect()->back();
if (empty($searchTerm)) return redirect()->back();
$pages = $this->pageRepo->getBySearch($searchTerm);
return view('pages/search-results', ['pages' => $pages, 'searchTerm' => $searchTerm]);
@ -158,6 +163,7 @@ class PageController extends Controller
*/
public function sortPages($bookSlug)
{
$this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($bookSlug);
return view('pages/sort', ['book' => $book, 'current' => $book]);
}
@ -165,26 +171,27 @@ class PageController extends Controller
/**
* Saves an array of sort mapping to pages and chapters.
*
* @param $bookSlug
* @param $bookSlug
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function savePageSort($bookSlug, Request $request)
{
$this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($bookSlug);
// Return if no map sent
if(!$request->has('sort-tree')) {
if (!$request->has('sort-tree')) {
return redirect($book->getUrl());
}
// Sort pages and chapters
$sortMap = json_decode($request->get('sort-tree'));
foreach($sortMap as $index => $bookChild) {
foreach ($sortMap as $index => $bookChild) {
$id = $bookChild->id;
$isPage = $bookChild->type == 'page';
$model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
$model->priority = $index;
if($isPage) {
if ($isPage) {
$model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
}
$model->save();
@ -201,6 +208,7 @@ class PageController extends Controller
*/
public function showDelete($bookSlug, $pageSlug)
{
$this->checkPermission('page-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
@ -216,6 +224,7 @@ class PageController extends Controller
*/
public function destroy($bookSlug, $pageSlug)
{
$this->checkPermission('page-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
Activity::addMessage('page_delete', $book->id, $page->name);
@ -255,6 +264,7 @@ class PageController extends Controller
public function restoreRevision($bookSlug, $pageSlug, $revisionId)
{
$this->checkPermission('page-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$revision = $this->pageRepo->getRevisionById($revisionId);

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

@ -6,7 +6,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Oxbow\Http\Requests;
use Oxbow\Http\Controllers\Controller;
use Oxbow\User;
class UserController extends Controller
@ -21,9 +20,9 @@ class UserController extends Controller
public function __construct(User $user)
{
$this->user = $user;
parent::__construct();
}
/**
* Display a listing of the users.
*
@ -32,7 +31,7 @@ class UserController extends Controller
public function index()
{
$users = $this->user->all();
return view('users/index', ['users'=> $users]);
return view('users/index', ['users' => $users]);
}
/**
@ -42,27 +41,32 @@ class UserController extends Controller
*/
public function create()
{
$this->checkPermission('user-create');
return view('users/create');
}
/**
* Store a newly created user in storage.
*
* @param Request $request
* @param Request $request
* @return Response
*/
public function store(Request $request)
{
$this->checkPermission('user-create');
$this->validate($request, [
'name' => 'required',
'email' => 'required|email',
'password' => 'required|min:5',
'password-confirm' => 'required|same:password'
'name' => 'required',
'email' => 'required|email',
'password' => 'required|min:5',
'password-confirm' => 'required|same:password',
'role' => 'required|exists:roles,id'
]);
$user = $this->user->fill($request->all());
$user->password = Hash::make($request->get('password'));
$user->save();
$user->attachRoleId($request->get('role'));
return redirect('/users');
}
@ -70,11 +74,14 @@ class UserController extends Controller
/**
* Show the form for editing the specified user.
*
* @param int $id
* @param int $id
* @return Response
*/
public function edit($id)
{
$this->checkPermissionOr('user-update', function () use ($id) {
return $this->currentUser->id == $id;
});
$user = $this->user->findOrFail($id);
return view('users/edit', ['user' => $user]);
}
@ -82,23 +89,31 @@ class UserController extends Controller
/**
* Update the specified user in storage.
*
* @param Request $request
* @param int $id
* @param Request $request
* @param int $id
* @return Response
*/
public function update(Request $request, $id)
{
$this->checkPermissionOr('user-update', function () use ($id) {
return $this->currentUser->id == $id;
});
$this->validate($request, [
'name' => 'required',
'email' => 'required|email',
'password' => 'min:5',
'password-confirm' => 'same:password'
'name' => 'required',
'email' => 'required|email',
'password' => 'min:5',
'password-confirm' => 'same:password',
'role' => 'exists:roles,id'
]);
$user = $this->user->findOrFail($id);
$user->fill($request->all());
if($request->has('password') && $request->get('password') != '') {
if ($this->currentUser->can('user-update') && $request->has('role')) {
$user->attachRoleId($request->get('role'));
}
if ($request->has('password') && $request->get('password') != '') {
$password = $request->get('password');
$user->password = Hash::make($password);
}
@ -113,6 +128,9 @@ class UserController extends Controller
*/
public function delete($id)
{
$this->checkPermissionOr('user-delete', function () use ($id) {
return $this->currentUser->id == $id;
});
$user = $this->user->findOrFail($id);
return view('users/delete', ['user' => $user]);
}
@ -120,11 +138,14 @@ class UserController extends Controller
/**
* Remove the specified user from storage.
*
* @param int $id
* @param int $id
* @return Response
*/
public function destroy($id)
{
$this->checkPermissionOr('user-delete', function () use ($id) {
return $this->currentUser->id == $id;
});
$user = $this->user->findOrFail($id);
$user->delete();
return redirect('/users');