# Cache and session
CACHE_DRIVER=file
SESSION_DRIVER=file
+# If using Memcached, comment the above and uncomment these
+#CACHE_DRIVER=memcached
+#SESSION_DRIVER=memcached
QUEUE_DRIVER=sync
+# Memcached settings
+# If using a UNIX socket path for the host, set the port to 0
+# This follows the following format: HOST:PORT:WEIGHT
+# For multiple servers separate with a comma
+MEMCACHED_SERVERS=127.0.0.1:11211:100
+
# Storage
STORAGE_TYPE=local
# Amazon S3 Config
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
+MAIL_ENCRYPTION=null
\ No newline at end of file
/**
* Get the entity for this activity.
- * @return bool
*/
public function entity()
{
- if ($this->entity_id) {
- return $this->morphTo('entity')->first();
- } else {
- return false;
- }
+ if ($this->entity_type === '') $this->entity_type = null;
+ return $this->morphTo('entity');
}
/**
-<?php
+<?php namespace BookStack;
-namespace BookStack;
-use Illuminate\Database\Eloquent\Model;
-
-abstract class Entity extends Model
+abstract class Entity extends Ownable
{
- use Ownable;
-
/**
* Compares this entity to another given entity.
* Matches by comparing class and id.
/**
* Get View objects for this entity.
- * @return mixed
*/
public function views()
{
}
/**
- * Allows checking of the exact class, Used to check entity type.
- * Cleaner method for is_a.
- * @param $type
+ * Get this entities restrictions.
+ */
+ public function restrictions()
+ {
+ return $this->morphMany('BookStack\Restriction', 'restrictable');
+ }
+
+ /**
+ * Check if this entity has a specific restriction set against it.
+ * @param $role_id
+ * @param $action
* @return bool
*/
- public static function isA($type)
+ public function hasRestriction($role_id, $action)
{
- return static::getClassName() === strtolower($type);
+ return $this->restrictions->where('role_id', $role_id)->where('action', $action)->count() > 0;
}
/**
- * Gets the class name.
- * @return string
+ * Allows checking of the exact class, Used to check entity type.
+ * Cleaner method for is_a.
+ * @param $type
+ * @return bool
*/
- public static function getClassName()
+ public static function isA($type)
{
- return strtolower(array_slice(explode('\\', static::class), -1, 1)[0]);
+ return static::getClassName() === strtolower($type);
}
/**
- *Gets a limited-length version of the entities name.
+ * Gets a limited-length version of the entities name.
* @param int $length
* @return string
*/
public function getShortName($length = 25)
{
- if(strlen($this->name) <= $length) return $this->name;
- return substr($this->name, 0, $length-3) . '...';
+ if (strlen($this->name) <= $length) return $this->name;
+ return substr($this->name, 0, $length - 3) . '...';
}
/**
*/
public static function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
{
- $termString = '';
- foreach ($terms as $term) {
- $termString .= htmlentities($term) . '* ';
+ $exactTerms = [];
+ foreach ($terms as $key => $term) {
+ $term = htmlentities($term, ENT_QUOTES);
+ $term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
+ if (preg_match('/\s/', $term)) {
+ $exactTerms[] = '%' . $term . '%';
+ $term = '"' . $term . '"';
+ } else {
+ $term = '' . $term . '*';
+ }
+ if ($term !== '*') $terms[$key] = $term;
}
+ $termString = implode(' ', $terms);
$fields = implode(',', $fieldsToSearch);
- $termStringEscaped = \DB::connection()->getPdo()->quote($termString);
- $search = static::addSelect(\DB::raw('*, MATCH(name) AGAINST('.$termStringEscaped.' IN BOOLEAN MODE) AS title_relevance'));
+ $search = static::selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
$search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
+ // Ensure at least one exact term matches if in search
+ if (count($exactTerms) > 0) {
+ $search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
+ foreach ($exactTerms as $exactTerm) {
+ foreach ($fieldsToSearch as $field) {
+ $query->orWhere($field, 'like', $exactTerm);
+ }
+ }
+ });
+ }
+
// Add additional where terms
foreach ($wheres as $whereTerm) {
$search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
}
-
// Load in relations
- if (static::isA('page')) {
+ if (static::isA('page')) {
$search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
} else if (static::isA('chapter')) {
$search = $search->with('book');
// Which will include the basic message to point the user roughly to the cause.
if (($e instanceof PrettyException || $e->getPrevious() instanceof PrettyException) && !config('app.debug')) {
$message = ($e instanceof PrettyException) ? $e->getMessage() : $e->getPrevious()->getMessage();
- return response()->view('errors/500', ['message' => $message], 500);
+ $code = ($e->getCode() === 0) ? 500 : $e->getCode();
+ return response()->view('errors/' . $code, ['message' => $message], $code);
}
return parent::render($request, $e);
--- /dev/null
+<?php namespace BookStack\Exceptions;
+
+
+class NotFoundException extends PrettyException {
+
+ /**
+ * NotFoundException constructor.
+ * @param string $message
+ */
+ public function __construct($message = 'Item not found')
+ {
+ parent::__construct($message, 404);
+ }
+}
\ No newline at end of file
--- /dev/null
+<?php namespace BookStack\Exceptions;
+
+
+use Exception;
+
+class PermissionsException extends Exception {}
\ No newline at end of file
/**
* Create a new authentication controller instance.
- * @param SocialAuthService $socialAuthService
+ * @param SocialAuthService $socialAuthService
* @param EmailConfirmationService $emailConfirmationService
- * @param UserRepo $userRepo
+ * @param UserRepo $userRepo
*/
public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
{
protected function validator(array $data)
{
return Validator::make($data, [
- 'name' => 'required|max:255',
- 'email' => 'required|email|max:255|unique:users',
+ 'name' => 'required|max:255',
+ 'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6',
]);
}
protected function checkRegistrationAllowed()
{
- if (!\Setting::get('registration-enabled')) {
+ if (!setting('registration-enabled')) {
throw new UserRegistrationException('Registrations are currently disabled.', '/login');
}
}
/**
* Overrides the action when a user is authenticated.
* If the user authenticated but does not exist in the user table we create them.
- * @param Request $request
+ * @param Request $request
* @param Authenticatable $user
* @return \Illuminate\Http\RedirectResponse
*/
// Create an array of the user data to create a new user instance
$userData = [
- 'name' => $socialUser->getName(),
- 'email' => $socialUser->getEmail(),
+ 'name' => $socialUser->getName(),
+ 'email' => $socialUser->getEmail(),
'password' => str_random(30)
];
return $this->registerUser($userData, $socialAccount);
/**
* The registrations flow for all users.
- * @param array $userData
+ * @param array $userData
* @param bool|false|SocialAccount $socialAccount
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws UserRegistrationException
*/
protected function registerUser(array $userData, $socialAccount = false)
{
- if (\Setting::get('registration-restrict')) {
- $restrictedEmailDomains = explode(',', str_replace(' ', '', \Setting::get('registration-restrict')));
+ if (setting('registration-restrict')) {
+ $restrictedEmailDomains = explode(',', str_replace(' ', '', setting('registration-restrict')));
$userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1);
if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
throw new UserRegistrationException('That email domain does not have access to this application', '/register');
$newUser->socialAccounts()->save($socialAccount);
}
- if (\Setting::get('registration-confirmation') || \Setting::get('registration-restrict')) {
+ if (setting('registration-confirmation') || setting('registration-restrict')) {
$newUser->email_confirmed = false;
$newUser->save();
$this->emailConfirmationService->sendConfirmation($newUser);
namespace BookStack\Http\Controllers;
use Activity;
+use BookStack\Repos\UserRepo;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
protected $bookRepo;
protected $pageRepo;
protected $chapterRepo;
+ protected $userRepo;
/**
* BookController constructor.
- * @param BookRepo $bookRepo
- * @param PageRepo $pageRepo
+ * @param BookRepo $bookRepo
+ * @param PageRepo $pageRepo
* @param ChapterRepo $chapterRepo
+ * @param UserRepo $userRepo
*/
- public function __construct(BookRepo $bookRepo, PageRepo $pageRepo, ChapterRepo $chapterRepo)
+ public function __construct(BookRepo $bookRepo, PageRepo $pageRepo, ChapterRepo $chapterRepo, UserRepo $userRepo)
{
$this->bookRepo = $bookRepo;
$this->pageRepo = $pageRepo;
$this->chapterRepo = $chapterRepo;
+ $this->userRepo = $userRepo;
parent::__construct();
}
*/
public function create()
{
- $this->checkPermission('book-create');
+ $this->checkPermission('book-create-all');
$this->setPageTitle('Create New Book');
return view('books/create');
}
*/
public function store(Request $request)
{
- $this->checkPermission('book-create');
+ $this->checkPermission('book-create-all');
$this->validate($request, [
- 'name' => 'required|string|max:255',
+ 'name' => 'required|string|max:255',
'description' => 'string|max:1000'
]);
$book = $this->bookRepo->newFromInput($request->all());
*/
public function edit($slug)
{
- $this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($slug);
+ $this->checkOwnablePermission('book-update', $book);
$this->setPageTitle('Edit Book ' . $book->getShortName());
return view('books/edit', ['book' => $book, 'current' => $book]);
}
*/
public function update(Request $request, $slug)
{
- $this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($slug);
+ $this->checkOwnablePermission('book-update', $book);
$this->validate($request, [
- 'name' => 'required|string|max:255',
+ 'name' => 'required|string|max:255',
'description' => 'string|max:1000'
]);
$book->fill($request->all());
*/
public function showDelete($bookSlug)
{
- $this->checkPermission('book-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
+ $this->checkOwnablePermission('book-delete', $book);
$this->setPageTitle('Delete Book ' . $book->getShortName());
return view('books/delete', ['book' => $book, 'current' => $book]);
}
*/
public function sort($bookSlug)
{
- $this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($bookSlug);
+ $this->checkOwnablePermission('book-update', $book);
$bookChildren = $this->bookRepo->getChildren($book);
$books = $this->bookRepo->getAll(false);
$this->setPageTitle('Sort Book ' . $book->getShortName());
/**
* Saves an array of sort mapping to pages and chapters.
- *
* @param string $bookSlug
* @param Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function saveSort($bookSlug, Request $request)
{
- $this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($bookSlug);
+ $this->checkOwnablePermission('book-update', $book);
// Return if no map sent
if (!$request->has('sort-tree')) {
/**
* Remove the specified book from storage.
- *
* @param $bookSlug
* @return Response
*/
public function destroy($bookSlug)
{
- $this->checkPermission('book-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
+ $this->checkOwnablePermission('book-delete', $book);
Activity::addMessage('book_delete', 0, $book->name);
Activity::removeEntity($book);
$this->bookRepo->destroyBySlug($bookSlug);
return redirect('/books');
}
+
+ /**
+ * Show the Restrictions view.
+ * @param $bookSlug
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function showRestrict($bookSlug)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $this->checkOwnablePermission('restrictions-manage', $book);
+ $roles = $this->userRepo->getRestrictableRoles();
+ return view('books/restrictions', [
+ 'book' => $book,
+ 'roles' => $roles
+ ]);
+ }
+
+ /**
+ * Set the restrictions for this book.
+ * @param $bookSlug
+ * @param $bookSlug
+ * @param Request $request
+ * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ */
+ public function restrict($bookSlug, Request $request)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $this->checkOwnablePermission('restrictions-manage', $book);
+ $this->bookRepo->updateRestrictionsFromRequest($request, $book);
+ session()->flash('success', 'Page Restrictions Updated');
+ return redirect($book->getUrl());
+ }
}
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;
use Activity;
+use BookStack\Repos\UserRepo;
use Illuminate\Http\Request;
-
-use Illuminate\Support\Facades\Auth;
use BookStack\Http\Requests;
-use BookStack\Http\Controllers\Controller;
use BookStack\Repos\BookRepo;
use BookStack\Repos\ChapterRepo;
use Views;
protected $bookRepo;
protected $chapterRepo;
+ protected $userRepo;
/**
* ChapterController constructor.
- * @param $bookRepo
- * @param $chapterRepo
+ * @param BookRepo $bookRepo
+ * @param ChapterRepo $chapterRepo
+ * @param UserRepo $userRepo
*/
- public function __construct(BookRepo $bookRepo, ChapterRepo $chapterRepo)
+ public function __construct(BookRepo $bookRepo, ChapterRepo $chapterRepo, UserRepo $userRepo)
{
$this->bookRepo = $bookRepo;
$this->chapterRepo = $chapterRepo;
+ $this->userRepo = $userRepo;
parent::__construct();
}
-
/**
* Show the form for creating a new chapter.
* @param $bookSlug
*/
public function create($bookSlug)
{
- $this->checkPermission('chapter-create');
$book = $this->bookRepo->getBySlug($bookSlug);
+ $this->checkOwnablePermission('chapter-create', $book);
$this->setPageTitle('Create New Chapter');
return view('chapters/create', ['book' => $book, 'current' => $book]);
}
*/
public function store($bookSlug, Request $request)
{
- $this->checkPermission('chapter-create');
$this->validate($request, [
'name' => 'required|string|max:255'
]);
$book = $this->bookRepo->getBySlug($bookSlug);
+ $this->checkOwnablePermission('chapter-create', $book);
+
$chapter = $this->chapterRepo->newFromInput($request->all());
$chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id);
$chapter->priority = $this->bookRepo->getNewPriority($book);
$sidebarTree = $this->bookRepo->getChildren($book);
Views::add($chapter);
$this->setPageTitle($chapter->getShortName());
- return view('chapters/show', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter, 'sidebarTree' => $sidebarTree]);
+ $pages = $this->chapterRepo->getChildren($chapter);
+ return view('chapters/show', [
+ 'book' => $book,
+ 'chapter' => $chapter,
+ 'current' => $chapter,
+ 'sidebarTree' => $sidebarTree,
+ 'pages' => $pages
+ ]);
}
/**
*/
public function edit($bookSlug, $chapterSlug)
{
- $this->checkPermission('chapter-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+ $this->checkOwnablePermission('chapter-update', $chapter);
$this->setPageTitle('Edit Chapter' . $chapter->getShortName());
return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
}
*/
public function update(Request $request, $bookSlug, $chapterSlug)
{
- $this->checkPermission('chapter-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+ $this->checkOwnablePermission('chapter-update', $chapter);
$chapter->fill($request->all());
$chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id, $chapter->id);
$chapter->updated_by = auth()->user()->id;
*/
public function showDelete($bookSlug, $chapterSlug)
{
- $this->checkPermission('chapter-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+ $this->checkOwnablePermission('chapter-delete', $chapter);
$this->setPageTitle('Delete Chapter' . $chapter->getShortName());
return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
}
*/
public function destroy($bookSlug, $chapterSlug)
{
- $this->checkPermission('chapter-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+ $this->checkOwnablePermission('chapter-delete', $chapter);
Activity::addMessage('chapter_delete', $book->id, $chapter->name);
$this->chapterRepo->destroy($chapter);
return redirect($book->getUrl());
}
+
+ /**
+ * Show the Restrictions view.
+ * @param $bookSlug
+ * @param $chapterSlug
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function showRestrict($bookSlug, $chapterSlug)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+ $this->checkOwnablePermission('restrictions-manage', $chapter);
+ $roles = $this->userRepo->getRestrictableRoles();
+ return view('chapters/restrictions', [
+ 'chapter' => $chapter,
+ 'roles' => $roles
+ ]);
+ }
+
+ /**
+ * Set the restrictions for this chapter.
+ * @param $bookSlug
+ * @param $chapterSlug
+ * @param Request $request
+ * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ */
+ public function restrict($bookSlug, $chapterSlug, Request $request)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+ $this->checkOwnablePermission('restrictions-manage', $chapter);
+ $this->chapterRepo->updateRestrictionsFromRequest($request, $chapter);
+ session()->flash('success', 'Page Restrictions Updated');
+ return redirect($chapter->getUrl());
+ }
}
namespace BookStack\Http\Controllers;
+use BookStack\Ownable;
use HttpRequestException;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Exception\HttpResponseException;
}
/**
- * On a permission error redirect to home and display
+ * On a permission error redirect to home and display.
* the error as a notification.
*/
protected function showPermissionError()
{
Session::flash('error', trans('errors.permission'));
- throw new HttpResponseException(
- redirect('/')
- );
+ $response = request()->wantsJson() ? response()->json(['error' => trans('errors.permissionJson')], 403) : redirect('/');
+ throw new HttpResponseException($response);
}
/**
* Checks for a permission.
- *
- * @param $permissionName
+ * @param string $permissionName
* @return bool|\Illuminate\Http\RedirectResponse
*/
protected function checkPermission($permissionName)
if (!$this->currentUser || !$this->currentUser->can($permissionName)) {
$this->showPermissionError();
}
-
return true;
}
+ /**
+ * Check the current user's permissions against an ownable item.
+ * @param $permission
+ * @param Ownable $ownable
+ * @return bool
+ */
+ protected function checkOwnablePermission($permission, Ownable $ownable)
+ {
+ if (userCan($permission, $ownable)) return true;
+ return $this->showPermissionError();
+ }
+
/**
* Check if a user has a permission or bypass if the callback is true.
* @param $permissionName
/**
* Display the homepage.
- *
* @return Response
*/
public function index()
*/
public function uploadByType($type, Request $request)
{
- $this->checkPermission('image-create');
+ $this->checkPermission('image-create-all');
$this->validate($request, [
'file' => 'image|mimes:jpeg,gif,png'
]);
*/
public function getThumbnail($id, $width, $height, $crop)
{
- $this->checkPermission('image-create');
+ $this->checkPermission('image-create-all');
$image = $this->imageRepo->getById($id);
$thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false');
return response()->json(['url' => $thumbnailUrl]);
*/
public function update($imageId, Request $request)
{
- $this->checkPermission('image-update');
$this->validate($request, [
'name' => 'required|min:2|string'
]);
$image = $this->imageRepo->getById($imageId);
+ $this->checkOwnablePermission('image-update', $image);
$image = $this->imageRepo->updateImageDetails($image, $request->all());
return response()->json($image);
}
*/
public function destroy(PageRepo $pageRepo, Request $request, $id)
{
- $this->checkPermission('image-delete');
$image = $this->imageRepo->getById($id);
+ $this->checkOwnablePermission('image-delete', $image);
// Check if this image is used on any pages
$isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;
use Activity;
+use BookStack\Exceptions\NotFoundException;
+use BookStack\Repos\UserRepo;
use BookStack\Services\ExportService;
use Illuminate\Http\Request;
-
-use Illuminate\Support\Facades\Auth;
use BookStack\Http\Requests;
use BookStack\Repos\BookRepo;
use BookStack\Repos\ChapterRepo;
protected $bookRepo;
protected $chapterRepo;
protected $exportService;
+ protected $userRepo;
/**
* PageController constructor.
- * @param PageRepo $pageRepo
- * @param BookRepo $bookRepo
- * @param ChapterRepo $chapterRepo
+ * @param PageRepo $pageRepo
+ * @param BookRepo $bookRepo
+ * @param ChapterRepo $chapterRepo
* @param ExportService $exportService
+ * @param UserRepo $userRepo
*/
- public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ExportService $exportService)
+ public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ExportService $exportService, UserRepo $userRepo)
{
$this->pageRepo = $pageRepo;
$this->bookRepo = $bookRepo;
$this->chapterRepo = $chapterRepo;
$this->exportService = $exportService;
+ $this->userRepo = $userRepo;
parent::__construct();
}
/**
* Show the form for creating a new page.
- *
* @param $bookSlug
* @param bool $chapterSlug
* @return Response
*/
public function create($bookSlug, $chapterSlug = false)
{
- $this->checkPermission('page-create');
$book = $this->bookRepo->getBySlug($bookSlug);
$chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
+ $parent = $chapter ? $chapter : $book;
+ $this->checkOwnablePermission('page-create', $parent);
$this->setPageTitle('Create New Page');
return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
}
/**
* Store a newly created page in storage.
- *
* @param Request $request
* @param $bookSlug
* @return Response
*/
public function store(Request $request, $bookSlug)
{
- $this->checkPermission('page-create');
$this->validate($request, [
'name' => 'required|string|max:255'
]);
$input = $request->all();
$book = $this->bookRepo->getBySlug($bookSlug);
$chapterId = ($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) ? $request->get('chapter') : null;
+ $parent = $chapterId !== null ? $this->chapterRepo->getById($chapterId) : $book;
+ $this->checkOwnablePermission('page-create', $parent);
$input['priority'] = $this->bookRepo->getNewPriority($book);
$page = $this->pageRepo->saveNew($input, $book, $chapterId);
* Display the specified page.
* If the page is not found via the slug the
* revisions are searched for a match.
- *
* @param $bookSlug
* @param $pageSlug
* @return Response
try {
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
- } catch (NotFoundHttpException $e) {
+ } catch (NotFoundException $e) {
$page = $this->pageRepo->findPageUsingOldSlug($pageSlug, $bookSlug);
if ($page === null) abort(404);
return redirect($page->getUrl());
/**
* Show the form for editing the specified page.
- *
* @param $bookSlug
* @param $pageSlug
* @return Response
*/
public function edit($bookSlug, $pageSlug)
{
- $this->checkPermission('page-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('page-update', $page);
$this->setPageTitle('Editing Page ' . $page->getShortName());
return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]);
}
/**
* Update the specified page in storage.
- *
* @param Request $request
* @param $bookSlug
* @param $pageSlug
*/
public function update(Request $request, $bookSlug, $pageSlug)
{
- $this->checkPermission('page-update');
$this->validate($request, [
'name' => 'required|string|max:255'
]);
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('page-update', $page);
$this->pageRepo->updatePage($page, $book->id, $request->all());
Activity::add($page, 'page_update', $book->id);
return redirect($page->getUrl());
*/
public function showDelete($bookSlug, $pageSlug)
{
- $this->checkPermission('page-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('page-delete', $page);
$this->setPageTitle('Delete Page ' . $page->getShortName());
return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
}
*/
public function destroy($bookSlug, $pageSlug)
{
- $this->checkPermission('page-delete');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('page-delete', $page);
Activity::addMessage('page_delete', $book->id, $page->name);
$this->pageRepo->destroy($page);
return redirect($book->getUrl());
*/
public function restoreRevision($bookSlug, $pageSlug, $revisionId)
{
- $this->checkPermission('page-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('page-update', $page);
$page = $this->pageRepo->restoreRevision($page, $book, $revisionId);
Activity::add($page, 'page_restore', $book->id);
return redirect($page->getUrl());
]);
}
+ /**
+ * Show the Restrictions view.
+ * @param $bookSlug
+ * @param $pageSlug
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function showRestrict($bookSlug, $pageSlug)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('restrictions-manage', $page);
+ $roles = $this->userRepo->getRestrictableRoles();
+ return view('pages/restrictions', [
+ 'page' => $page,
+ 'roles' => $roles
+ ]);
+ }
+
+ /**
+ * Set the restrictions for this page.
+ * @param $bookSlug
+ * @param $pageSlug
+ * @param Request $request
+ * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ */
+ public function restrict($bookSlug, $pageSlug, Request $request)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('restrictions-manage', $page);
+ $this->pageRepo->updateRestrictionsFromRequest($request, $page);
+ session()->flash('success', 'Page Restrictions Updated');
+ return redirect($page->getUrl());
+ }
+
}
--- /dev/null
+<?php namespace BookStack\Http\Controllers;
+
+use BookStack\Exceptions\PermissionsException;
+use BookStack\Repos\PermissionsRepo;
+use Illuminate\Http\Request;
+use BookStack\Http\Requests;
+
+class PermissionController extends Controller
+{
+
+ protected $permissionsRepo;
+
+ /**
+ * PermissionController constructor.
+ * @param PermissionsRepo $permissionsRepo
+ */
+ public function __construct(PermissionsRepo $permissionsRepo)
+ {
+ $this->permissionsRepo = $permissionsRepo;
+ parent::__construct();
+ }
+
+ /**
+ * Show a listing of the roles in the system.
+ */
+ public function listRoles()
+ {
+ $this->checkPermission('user-roles-manage');
+ $roles = $this->permissionsRepo->getAllRoles();
+ return view('settings/roles/index', ['roles' => $roles]);
+ }
+
+ /**
+ * Show the form to create a new role
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function createRole()
+ {
+ $this->checkPermission('user-roles-manage');
+ return view('settings/roles/create');
+ }
+
+ /**
+ * Store a new role in the system.
+ * @param Request $request
+ * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ */
+ public function storeRole(Request $request)
+ {
+ $this->checkPermission('user-roles-manage');
+ $this->validate($request, [
+ 'display_name' => 'required|min:3|max:200',
+ 'description' => 'max:250'
+ ]);
+
+ $this->permissionsRepo->saveNewRole($request->all());
+ session()->flash('success', 'Role successfully created');
+ return redirect('/settings/roles');
+ }
+
+ /**
+ * Show the form for editing a user role.
+ * @param $id
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function editRole($id)
+ {
+ $this->checkPermission('user-roles-manage');
+ $role = $this->permissionsRepo->getRoleById($id);
+ return view('settings/roles/edit', ['role' => $role]);
+ }
+
+ /**
+ * Updates a user role.
+ * @param $id
+ * @param Request $request
+ * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ */
+ public function updateRole($id, Request $request)
+ {
+ $this->checkPermission('user-roles-manage');
+ $this->validate($request, [
+ 'display_name' => 'required|min:3|max:200',
+ 'description' => 'max:250'
+ ]);
+
+ $this->permissionsRepo->updateRole($id, $request->all());
+ session()->flash('success', 'Role successfully updated');
+ return redirect('/settings/roles');
+ }
+
+ /**
+ * Show the view to delete a role.
+ * Offers the chance to migrate users.
+ * @param $id
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function showDeleteRole($id)
+ {
+ $this->checkPermission('user-roles-manage');
+ $role = $this->permissionsRepo->getRoleById($id);
+ $roles = $this->permissionsRepo->getAllRolesExcept($role);
+ $blankRole = $role->newInstance(['display_name' => 'Don\'t migrate users']);
+ $roles->prepend($blankRole);
+ return view('settings/roles/delete', ['role' => $role, 'roles' => $roles]);
+ }
+
+ /**
+ * Delete a role from the system,
+ * Migrate from a previous role if set.
+ * @param $id
+ * @param Request $request
+ * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ */
+ public function deleteRole($id, Request $request)
+ {
+ $this->checkPermission('user-roles-manage');
+
+ try {
+ $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id'));
+ } catch (PermissionsException $e) {
+ session()->flash('error', $e->getMessage());
+ return redirect()->back();
+ }
+
+ session()->flash('success', 'Role successfully deleted');
+ return redirect('/settings/roles');
+ }
+}
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;
use Illuminate\Http\Request;
use BookStack\Http\Requests;
-use BookStack\Http\Controllers\Controller;
use Setting;
class SettingController extends Controller
{
/**
* Display a listing of the settings.
- *
* @return Response
*/
public function index()
{
- $this->checkPermission('settings-update');
+ $this->checkPermission('settings-manage');
$this->setPageTitle('Settings');
return view('settings/index');
}
-
/**
* Update the specified settings in storage.
- *
- * @param Request $request
+ * @param Request $request
* @return Response
*/
public function update(Request $request)
{
$this->preventAccessForDemoUsers();
- $this->checkPermission('settings-update');
+ $this->checkPermission('settings-manage');
// Cycles through posted settings and update them
- foreach($request->all() as $name => $value) {
- if(strpos($name, 'setting-') !== 0) continue;
+ foreach ($request->all() as $name => $value) {
+ if (strpos($name, 'setting-') !== 0) continue;
$key = str_replace('setting-', '', trim($name));
Setting::put($key, $value);
}
*/
public function index()
{
- $users = $this->user->all();
+ $this->checkPermission('users-manage');
+ $users = $this->userRepo->getAllUsers();
$this->setPageTitle('Users');
return view('users/index', ['users' => $users]);
}
*/
public function create()
{
- $this->checkPermission('user-create');
+ $this->checkPermission('users-manage');
$authMethod = config('auth.method');
return view('users/create', ['authMethod' => $authMethod]);
}
*/
public function store(Request $request)
{
- $this->checkPermission('user-create');
+ $this->checkPermission('users-manage');
$validationRules = [
'name' => 'required',
- 'email' => 'required|email|unique:users,email',
- 'role' => 'required|exists:roles,id'
+ 'email' => 'required|email|unique:users,email'
];
$authMethod = config('auth.method');
}
$user->save();
- $user->attachRoleId($request->get('role'));
+
+ if ($request->has('roles')) {
+ $roles = $request->get('roles');
+ $user->roles()->sync($roles);
+ }
// Get avatar from gravatar and save
if (!config('services.disable_services')) {
*/
public function edit($id, SocialAuthService $socialAuthService)
{
- $this->checkPermissionOr('user-update', function () use ($id) {
+ $this->checkPermissionOr('users-manage', function () use ($id) {
return $this->currentUser->id == $id;
});
public function update(Request $request, $id)
{
$this->preventAccessForDemoUsers();
- $this->checkPermissionOr('user-update', function () use ($id) {
+ $this->checkPermissionOr('users-manage', function () use ($id) {
return $this->currentUser->id == $id;
});
'name' => 'min:2',
'email' => 'min:2|email|unique:users,email,' . $id,
'password' => 'min:5|required_with:password_confirm',
- 'password-confirm' => 'same:password|required_with:password',
- 'role' => 'exists:roles,id'
+ 'password-confirm' => 'same:password|required_with:password'
], [
'password-confirm.required_with' => 'Password confirmation required'
]);
$user->fill($request->all());
// Role updates
- if ($this->currentUser->can('user-update') && $request->has('role')) {
- $user->attachRoleId($request->get('role'));
+ if (userCan('users-manage') && $request->has('roles')) {
+ $roles = $request->get('roles');
+ $user->roles()->sync($roles);
}
// Password updates
}
// External auth id updates
- if ($this->currentUser->can('user-update') && $request->has('external_auth_id')) {
+ if ($this->currentUser->can('users-manage') && $request->has('external_auth_id')) {
$user->external_auth_id = $request->get('external_auth_id');
}
$user->save();
+ session()->flash('success', 'User successfully updated');
return redirect('/settings/users');
}
*/
public function delete($id)
{
- $this->checkPermissionOr('user-delete', function () use ($id) {
+ $this->checkPermissionOr('users-manage', function () use ($id) {
return $this->currentUser->id == $id;
});
public function destroy($id)
{
$this->preventAccessForDemoUsers();
- $this->checkPermissionOr('user-delete', function () use ($id) {
+ $this->checkPermissionOr('users-manage', function () use ($id) {
return $this->currentUser->id == $id;
});
return redirect()->guest('/register/confirm/awaiting');
}
- if ($this->auth->guest() && !Setting::get('app-public')) {
+ if ($this->auth->guest() && !setting('app-public')) {
if ($request->ajax()) {
return response('Unauthorized.', 401);
} else {
Route::delete('/{id}', 'BookController@destroy');
Route::get('/{slug}/sort-item', 'BookController@getSortItem');
Route::get('/{slug}', 'BookController@show');
+ Route::get('/{bookSlug}/restrict', 'BookController@showRestrict');
+ Route::put('/{bookSlug}/restrict', 'BookController@restrict');
Route::get('/{slug}/delete', 'BookController@showDelete');
Route::get('/{bookSlug}/sort', 'BookController@sort');
Route::put('/{bookSlug}/sort', 'BookController@saveSort');
Route::get('/{bookSlug}/page/{pageSlug}/export/plaintext', 'PageController@exportPlainText');
Route::get('/{bookSlug}/page/{pageSlug}/edit', 'PageController@edit');
Route::get('/{bookSlug}/page/{pageSlug}/delete', 'PageController@showDelete');
+ Route::get('/{bookSlug}/page/{pageSlug}/restrict', 'PageController@showRestrict');
+ Route::put('/{bookSlug}/page/{pageSlug}/restrict', 'PageController@restrict');
Route::put('/{bookSlug}/page/{pageSlug}', 'PageController@update');
Route::delete('/{bookSlug}/page/{pageSlug}', 'PageController@destroy');
Route::get('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@show');
Route::put('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@update');
Route::get('/{bookSlug}/chapter/{chapterSlug}/edit', 'ChapterController@edit');
+ Route::get('/{bookSlug}/chapter/{chapterSlug}/restrict', 'ChapterController@showRestrict');
+ Route::put('/{bookSlug}/chapter/{chapterSlug}/restrict', 'ChapterController@restrict');
Route::get('/{bookSlug}/chapter/{chapterSlug}/delete', 'ChapterController@showDelete');
Route::delete('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@destroy');
Route::group(['prefix' => 'settings'], function() {
Route::get('/', 'SettingController@index');
Route::post('/', 'SettingController@update');
+
// Users
Route::get('/users', 'UserController@index');
Route::get('/users/create', 'UserController@create');
Route::get('/users/{id}', 'UserController@edit');
Route::put('/users/{id}', 'UserController@update');
Route::delete('/users/{id}', 'UserController@destroy');
+
+ // Roles
+ Route::get('/roles', 'PermissionController@listRoles');
+ Route::get('/roles/new', 'PermissionController@createRole');
+ Route::post('/roles/new', 'PermissionController@storeRole');
+ Route::get('/roles/delete/{id}', 'PermissionController@showDeleteRole');
+ Route::delete('/roles/delete/{id}', 'PermissionController@deleteRole');
+ Route::get('/roles/{id}', 'PermissionController@editRole');
+ Route::put('/roles/{id}', 'PermissionController@updateRole');
});
});
-<?php
+<?php namespace BookStack;
-namespace BookStack;
-
-
-use Illuminate\Database\Eloquent\Model;
use Images;
-class Image extends Model
+class Image extends Ownable
{
- use Ownable;
protected $fillable = ['name'];
<?php namespace BookStack;
+use Illuminate\Database\Eloquent\Model;
-trait Ownable
+abstract class Ownable extends Model
{
/**
* Relation for the user that created this entity.
{
return $this->belongsTo('BookStack\User', 'updated_by');
}
+
+ /**
+ * Gets the class name.
+ * @return string
+ */
+ public static function getClassName()
+ {
+ return strtolower(array_slice(explode('\\', static::class), -1, 1)[0]);
+ }
+
}
\ No newline at end of file
{
return $this->belongsToMany('BookStack\Permissions');
}
+
+ /**
+ * Get the permission object by name.
+ * @param $roleName
+ * @return mixed
+ */
+ public static function getByName($name)
+ {
+ return static::where('name', '=', $name)->first();
+ }
}
public function register()
{
$this->app->bind('activity', function() {
- return new ActivityService($this->app->make('BookStack\Activity'));
+ return new ActivityService(
+ $this->app->make('BookStack\Activity'),
+ $this->app->make('BookStack\Services\RestrictionService')
+ );
});
$this->app->bind('views', function() {
- return new ViewService($this->app->make('BookStack\View'));
+ return new ViewService(
+ $this->app->make('BookStack\View'),
+ $this->app->make('BookStack\Services\RestrictionService')
+ );
});
$this->app->bind('setting', function() {
$this->app->make('Illuminate\Contracts\Cache\Repository')
);
});
+
$this->app->bind('images', function() {
return new ImageService(
$this->app->make('Intervention\Image\ImageManager'),
<?php namespace BookStack\Repos;
-use Activity;
+use BookStack\Exceptions\NotFoundException;
use Illuminate\Support\Str;
use BookStack\Book;
use Views;
-class BookRepo
+class BookRepo extends EntityRepo
{
-
- protected $book;
protected $pageRepo;
protected $chapterRepo;
/**
* BookRepo constructor.
- * @param Book $book
* @param PageRepo $pageRepo
* @param ChapterRepo $chapterRepo
*/
- public function __construct(Book $book, PageRepo $pageRepo, ChapterRepo $chapterRepo)
+ public function __construct(PageRepo $pageRepo, ChapterRepo $chapterRepo)
{
- $this->book = $book;
$this->pageRepo = $pageRepo;
$this->chapterRepo = $chapterRepo;
+ parent::__construct();
+ }
+
+ /**
+ * Base query for getting books.
+ * Takes into account any restrictions.
+ * @return mixed
+ */
+ private function bookQuery()
+ {
+ return $this->restrictionService->enforceBookRestrictions($this->book, 'view');
}
/**
*/
public function getById($id)
{
- return $this->book->findOrFail($id);
+ return $this->bookQuery()->findOrFail($id);
}
/**
*/
public function getAll($count = 10)
{
- $bookQuery = $this->book->orderBy('name', 'asc');
+ $bookQuery = $this->bookQuery()->orderBy('name', 'asc');
if (!$count) return $bookQuery->get();
return $bookQuery->take($count)->get();
}
*/
public function getAllPaginated($count = 10)
{
- return $this->book->orderBy('name', 'asc')->paginate($count);
+ return $this->bookQuery()
+ ->orderBy('name', 'asc')->paginate($count);
}
*/
public function getLatest($count = 10)
{
- return $this->book->orderBy('created_at', 'desc')->take($count)->get();
+ return $this->bookQuery()->orderBy('created_at', 'desc')->take($count)->get();
}
/**
* Get a book by slug
* @param $slug
* @return mixed
+ * @throws NotFoundException
*/
public function getBySlug($slug)
{
- $book = $this->book->where('slug', '=', $slug)->first();
- if ($book === null) abort(404);
+ $book = $this->bookQuery()->where('slug', '=', $slug)->first();
+ if ($book === null) throw new NotFoundException('Book not found');
return $book;
}
*/
public function exists($id)
{
- return $this->book->where('id', '=', $id)->exists();
+ return $this->bookQuery()->where('id', '=', $id)->exists();
}
/**
*/
public function newFromInput($input)
{
- return $this->book->fill($input);
- }
-
- /**
- * Count the amount of books that have a specific slug.
- * @param $slug
- * @return mixed
- */
- public function countBySlug($slug)
- {
- return $this->book->where('slug', '=', $slug)->count();
+ return $this->book->newInstance($input);
}
/**
$this->chapterRepo->destroy($chapter);
}
$book->views()->delete();
+ $book->restrictions()->delete();
$book->delete();
}
*/
public function getChildren(Book $book)
{
- $pages = $book->pages()->where('chapter_id', '=', 0)->get();
- $chapters = $book->chapters()->with('pages')->get();
+ $pageQuery = $book->pages()->where('chapter_id', '=', 0);
+ $pageQuery = $this->restrictionService->enforcePageRestrictions($pageQuery, 'view');
+ $pages = $pageQuery->get();
+
+ $chapterQuery = $book->chapters()->with(['pages' => function($query) {
+ $this->restrictionService->enforcePageRestrictions($query, 'view');
+ }]);
+ $chapterQuery = $this->restrictionService->enforceChapterRestrictions($chapterQuery, 'view');
+ $chapters = $chapterQuery->get();
$children = $pages->merge($chapters);
$bookSlug = $book->slug;
$children->each(function ($child) use ($bookSlug) {
*/
public function getBySearch($term, $count = 20, $paginationAppends = [])
{
- $terms = explode(' ', $term);
- $books = $this->book->fullTextSearchQuery(['name', 'description'], $terms)
+ $terms = $this->prepareSearchTerms($term);
+ $books = $this->restrictionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms))
->paginate($count)->appends($paginationAppends);
$words = join('|', explode(' ', preg_quote(trim($term), '/')));
foreach ($books as $book) {
use Activity;
+use BookStack\Exceptions\NotFoundException;
use Illuminate\Support\Str;
use BookStack\Chapter;
-class ChapterRepo
+class ChapterRepo extends EntityRepo
{
-
- protected $chapter;
-
/**
- * ChapterRepo constructor.
- * @param $chapter
+ * Base query for getting chapters, Takes restrictions into account.
+ * @return mixed
*/
- public function __construct(Chapter $chapter)
+ private function chapterQuery()
{
- $this->chapter = $chapter;
+ return $this->restrictionService->enforceChapterRestrictions($this->chapter, 'view');
}
/**
*/
public function idExists($id)
{
- return $this->chapter->where('id', '=', $id)->count() > 0;
+ return $this->chapterQuery()->where('id', '=', $id)->count() > 0;
}
/**
*/
public function getById($id)
{
- return $this->chapter->findOrFail($id);
+ return $this->chapterQuery()->findOrFail($id);
}
/**
*/
public function getAll()
{
- return $this->chapter->all();
+ return $this->chapterQuery()->all();
}
/**
* @param $slug
* @param $bookId
* @return mixed
+ * @throws NotFoundException
*/
public function getBySlug($slug, $bookId)
{
- $chapter = $this->chapter->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
- if ($chapter === null) abort(404);
+ $chapter = $this->chapterQuery()->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
+ if ($chapter === null) throw new NotFoundException('Chapter not found');
return $chapter;
}
+ /**
+ * Get the child items for a chapter
+ * @param Chapter $chapter
+ */
+ public function getChildren(Chapter $chapter)
+ {
+ return $this->restrictionService->enforcePageRestrictions($chapter->pages())->get();
+ }
+
/**
* Create a new chapter from request input.
* @param $input
}
Activity::removeEntity($chapter);
$chapter->views()->delete();
+ $chapter->restrictions()->delete();
$chapter->delete();
}
/**
* Get chapters by the given search term.
- * @param $term
+ * @param string $term
* @param array $whereTerms
* @param int $count
* @param array $paginationAppends
*/
public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
{
- $terms = explode(' ', $term);
- $chapters = $this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms)
+ $terms = $this->prepareSearchTerms($term);
+ $chapters = $this->restrictionService->enforceChapterRestrictions($this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms))
->paginate($count)->appends($paginationAppends);
$words = join('|', explode(' ', preg_quote(trim($term), '/')));
foreach ($chapters as $chapter) {
<?php namespace BookStack\Repos;
-
use BookStack\Book;
use BookStack\Chapter;
+use BookStack\Entity;
use BookStack\Page;
+use BookStack\Services\RestrictionService;
class EntityRepo
{
+ /**
+ * @var Book $book
+ */
public $book;
+
+ /**
+ * @var Chapter
+ */
public $chapter;
+
+ /**
+ * @var Page
+ */
public $page;
+ /**
+ * @var RestrictionService
+ */
+ protected $restrictionService;
+
/**
* EntityService constructor.
- * @param $book
- * @param $chapter
- * @param $page
*/
- public function __construct(Book $book, Chapter $chapter, Page $page)
+ public function __construct()
{
- $this->book = $book;
- $this->chapter = $chapter;
- $this->page = $page;
+ $this->book = app(Book::class);
+ $this->chapter = app(Chapter::class);
+ $this->page = app(Page::class);
+ $this->restrictionService = app(RestrictionService::class);
}
/**
* Get the latest books added to the system.
- * @param $count
- * @param $page
+ * @param int $count
+ * @param int $page
+ * @param bool $additionalQuery
+ * @return
*/
- public function getRecentlyCreatedBooks($count = 20, $page = 0)
+ public function getRecentlyCreatedBooks($count = 20, $page = 0, $additionalQuery = false)
{
- return $this->book->orderBy('created_at', 'desc')->skip($page*$count)->take($count)->get();
+ $query = $this->restrictionService->enforceBookRestrictions($this->book)
+ ->orderBy('created_at', 'desc');
+ if ($additionalQuery !== false && is_callable($additionalQuery)) {
+ $additionalQuery($query);
+ }
+ return $query->skip($page * $count)->take($count)->get();
}
/**
*/
public function getRecentlyUpdatedBooks($count = 20, $page = 0)
{
- return $this->book->orderBy('updated_at', 'desc')->skip($page*$count)->take($count)->get();
+ return $this->restrictionService->enforceBookRestrictions($this->book)
+ ->orderBy('updated_at', 'desc')->skip($page * $count)->take($count)->get();
}
/**
* Get the latest pages added to the system.
- * @param $count
- * @param $page
+ * @param int $count
+ * @param int $page
+ * @param bool $additionalQuery
+ * @return
*/
- public function getRecentlyCreatedPages($count = 20, $page = 0)
+ public function getRecentlyCreatedPages($count = 20, $page = 0, $additionalQuery = false)
{
- return $this->page->orderBy('created_at', 'desc')->skip($page*$count)->take($count)->get();
+ $query = $this->restrictionService->enforcePageRestrictions($this->page)
+ ->orderBy('created_at', 'desc');
+ if ($additionalQuery !== false && is_callable($additionalQuery)) {
+ $additionalQuery($query);
+ }
+ return $query->skip($page * $count)->take($count)->get();
+ }
+
+ /**
+ * Get the latest chapters added to the system.
+ * @param int $count
+ * @param int $page
+ * @param bool $additionalQuery
+ * @return
+ */
+ public function getRecentlyCreatedChapters($count = 20, $page = 0, $additionalQuery = false)
+ {
+ $query = $this->restrictionService->enforceChapterRestrictions($this->chapter)
+ ->orderBy('created_at', 'desc');
+ if ($additionalQuery !== false && is_callable($additionalQuery)) {
+ $additionalQuery($query);
+ }
+ return $query->skip($page * $count)->take($count)->get();
}
/**
*/
public function getRecentlyUpdatedPages($count = 20, $page = 0)
{
- return $this->page->orderBy('updated_at', 'desc')->skip($page*$count)->take($count)->get();
+ return $this->restrictionService->enforcePageRestrictions($this->page)
+ ->orderBy('updated_at', 'desc')->skip($page * $count)->take($count)->get();
+ }
+
+ /**
+ * Updates entity restrictions from a request
+ * @param $request
+ * @param Entity $entity
+ */
+ public function updateRestrictionsFromRequest($request, Entity $entity)
+ {
+ $entity->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
+ $entity->restrictions()->delete();
+ if ($request->has('restrictions')) {
+ foreach ($request->get('restrictions') as $roleId => $restrictions) {
+ foreach ($restrictions as $action => $value) {
+ $entity->restrictions()->create([
+ 'role_id' => $roleId,
+ 'action' => strtolower($action)
+ ]);
+ }
+ }
+ }
+ $entity->save();
+ }
+
+ /**
+ * Prepare a string of search terms by turning
+ * it into an array of terms.
+ * Keeps quoted terms together.
+ * @param $termString
+ * @return array
+ */
+ protected function prepareSearchTerms($termString)
+ {
+ preg_match_all('/"(.*?)"/', $termString, $matches);
+ if (count($matches[1]) > 0) {
+ $terms = $matches[1];
+ $termString = trim(preg_replace('/"(.*?)"/', '', $termString));
+ } else {
+ $terms = [];
+ }
+ if (!empty($termString)) $terms = array_merge($terms, explode(' ', $termString));
+ return $terms;
}
use Activity;
use BookStack\Book;
-use BookStack\Chapter;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
+use BookStack\Exceptions\NotFoundException;
use Illuminate\Support\Str;
use BookStack\Page;
use BookStack\PageRevision;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-class PageRepo
+class PageRepo extends EntityRepo
{
- protected $page;
protected $pageRevision;
/**
* PageRepo constructor.
- * @param Page $page
* @param PageRevision $pageRevision
*/
- public function __construct(Page $page, PageRevision $pageRevision)
+ public function __construct(PageRevision $pageRevision)
{
- $this->page = $page;
$this->pageRevision = $pageRevision;
+ parent::__construct();
}
/**
- * Check if a page id exists.
- * @param $id
- * @return bool
+ * Base query for getting pages, Takes restrictions into account.
+ * @return mixed
*/
- public function idExists($id)
+ private function pageQuery()
{
- return $this->page->where('page_id', '=', $id)->count() > 0;
+ return $this->restrictionService->enforcePageRestrictions($this->page, 'view');
}
/**
*/
public function getById($id)
{
- return $this->page->findOrFail($id);
- }
-
- /**
- * Get all pages.
- * @return \Illuminate\Database\Eloquent\Collection|static[]
- */
- public function getAll()
- {
- return $this->page->all();
+ return $this->pageQuery()->findOrFail($id);
}
/**
* @param $slug
* @param $bookId
* @return mixed
+ * @throws NotFoundException
*/
public function getBySlug($slug, $bookId)
{
- $page = $this->page->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
- if ($page === null) throw new NotFoundHttpException('Page not found');
+ $page = $this->pageQuery()->where('slug', '=', $slug)->where('book_id', '=', $bookId)->first();
+ if ($page === null) throw new NotFoundException('Page not found');
return $page;
}
public function findPageUsingOldSlug($pageSlug, $bookSlug)
{
$revision = $this->pageRevision->where('slug', '=', $pageSlug)
+ ->whereHas('page', function($query) {
+ $this->restrictionService->enforcePageRestrictions($query);
+ })
->where('book_slug', '=', $bookSlug)->orderBy('created_at', 'desc')
->with('page')->first();
return $revision !== null ? $revision->page : null;
*/
public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
{
- $terms = explode(' ', $term);
- $pages = $this->page->fullTextSearchQuery(['name', 'text'], $terms, $whereTerms)
+ $terms = $this->prepareSearchTerms($term);
+ $pages = $this->restrictionService->enforcePageRestrictions($this->page->fullTextSearchQuery(['name', 'text'], $terms, $whereTerms))
->paginate($count)->appends($paginationAppends);
// Add highlights to page text.
*/
public function searchForImage($imageString)
{
- $pages = $this->page->where('html', 'like', '%' . $imageString . '%')->get();
+ $pages = $this->pageQuery()->where('html', 'like', '%' . $imageString . '%')->get();
foreach ($pages as $page) {
$page->url = $page->getUrl();
$page->html = '';
Activity::removeEntity($page);
$page->views()->delete();
$page->revisions()->delete();
+ $page->restrictions()->delete();
$page->delete();
}
*/
public function getRecentlyCreatedPaginated($count = 20)
{
- return $this->page->orderBy('created_at', 'desc')->paginate($count);
+ return $this->pageQuery()->orderBy('created_at', 'desc')->paginate($count);
}
/**
*/
public function getRecentlyUpdatedPaginated($count = 20)
{
- return $this->page->orderBy('updated_at', 'desc')->paginate($count);
+ return $this->pageQuery()->orderBy('updated_at', 'desc')->paginate($count);
}
}
--- /dev/null
+<?php namespace BookStack\Repos;
+
+
+use BookStack\Exceptions\PermissionsException;
+use BookStack\Permission;
+use BookStack\Role;
+use Setting;
+
+class PermissionsRepo
+{
+
+ protected $permission;
+ protected $role;
+
+ /**
+ * PermissionsRepo constructor.
+ * @param $permission
+ * @param $role
+ */
+ public function __construct(Permission $permission, Role $role)
+ {
+ $this->permission = $permission;
+ $this->role = $role;
+ }
+
+ /**
+ * Get all the user roles from the system.
+ * @return \Illuminate\Database\Eloquent\Collection|static[]
+ */
+ public function getAllRoles()
+ {
+ return $this->role->all();
+ }
+
+ /**
+ * Get all the roles except for the provided one.
+ * @param Role $role
+ * @return mixed
+ */
+ public function getAllRolesExcept(Role $role)
+ {
+ return $this->role->where('id', '!=', $role->id)->get();
+ }
+
+ /**
+ * Get a role via its ID.
+ * @param $id
+ * @return mixed
+ */
+ public function getRoleById($id)
+ {
+ return $this->role->findOrFail($id);
+ }
+
+ /**
+ * Save a new role into the system.
+ * @param array $roleData
+ * @return Role
+ */
+ public function saveNewRole($roleData)
+ {
+ $role = $this->role->newInstance($roleData);
+ $role->name = str_replace(' ', '-', strtolower($roleData['display_name']));
+ // Prevent duplicate names
+ while ($this->role->where('name', '=', $role->name)->count() > 0) {
+ $role->name .= strtolower(str_random(2));
+ }
+ $role->save();
+
+ $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
+ $this->assignRolePermissions($role, $permissions);
+ return $role;
+ }
+
+ /**
+ * Updates an existing role.
+ * Ensure Admin role always has all permissions.
+ * @param $roleId
+ * @param $roleData
+ */
+ public function updateRole($roleId, $roleData)
+ {
+ $role = $this->role->findOrFail($roleId);
+ $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
+ $this->assignRolePermissions($role, $permissions);
+
+ if ($role->name === 'admin') {
+ $permissions = $this->permission->all()->pluck('id')->toArray();
+ $role->permissions()->sync($permissions);
+ }
+
+ $role->fill($roleData);
+ $role->save();
+ }
+
+ /**
+ * Assign an list of permission names to an role.
+ * @param Role $role
+ * @param array $permissionNameArray
+ */
+ public function assignRolePermissions(Role $role, $permissionNameArray = [])
+ {
+ $permissions = [];
+ $permissionNameArray = array_values($permissionNameArray);
+ if ($permissionNameArray && count($permissionNameArray) > 0) {
+ $permissions = $this->permission->whereIn('name', $permissionNameArray)->pluck('id')->toArray();
+ }
+ $role->permissions()->sync($permissions);
+ }
+
+ /**
+ * Delete a role from the system.
+ * Check it's not an admin role or set as default before deleting.
+ * If an migration Role ID is specified the users assign to the current role
+ * will be added to the role of the specified id.
+ * @param $roleId
+ * @param $migrateRoleId
+ * @throws PermissionsException
+ */
+ public function deleteRole($roleId, $migrateRoleId)
+ {
+ $role = $this->role->findOrFail($roleId);
+
+ // Prevent deleting admin role or default registration role.
+ if ($role->name === 'admin') {
+ throw new PermissionsException('The admin role cannot be deleted');
+ } else if ($role->id == setting('registration-role')) {
+ throw new PermissionsException('This role cannot be deleted while set as the default registration role.');
+ }
+
+ if ($migrateRoleId) {
+ $newRole = $this->role->find($migrateRoleId);
+ if ($newRole) {
+ $users = $role->users->pluck('id')->toArray();
+ $newRole->users()->sync($users);
+ }
+ }
+
+ $role->delete();
+ }
+
+}
\ No newline at end of file
return $this->user->findOrFail($id);
}
+ /**
+ * Get all the users with their permissions.
+ * @return \Illuminate\Database\Eloquent\Builder|static
+ */
+ public function getAllUsers()
+ {
+ return $this->user->with('roles', 'avatar')->orderBy('name', 'asc')->get();
+ }
+
/**
* Creates a new user and attaches a role to them.
* @param array $data
*/
public function attachDefaultRole($user)
{
- $roleId = Setting::get('registration-role');
- if ($roleId === false) $roleId = $this->role->getDefault()->id;
+ $roleId = setting('registration-role');
+ if ($roleId === false) $roleId = $this->role->first()->id;
$user->attachRoleId($roleId);
}
*/
public function isOnlyAdmin(User $user)
{
- if ($user->role->name != 'admin') {
- return false;
- }
-
- $adminRole = $this->role->where('name', '=', 'admin')->first();
- if (count($adminRole->users) > 1) {
- return false;
- }
+ if (!$user->roles->pluck('name')->contains('admin')) return false;
+ $adminRole = $this->role->getRole('admin');
+ if ($adminRole->users->count() > 1) return false;
return true;
}
public function getRecentlyCreated(User $user, $count = 20)
{
return [
- 'pages' => $this->entityRepo->page->where('created_by', '=', $user->id)->orderBy('created_at', 'desc')
- ->take($count)->get(),
- 'chapters' => $this->entityRepo->chapter->where('created_by', '=', $user->id)->orderBy('created_at', 'desc')
- ->take($count)->get(),
- 'books' => $this->entityRepo->book->where('created_by', '=', $user->id)->orderBy('created_at', 'desc')
- ->take($count)->get()
+ 'pages' => $this->entityRepo->getRecentlyCreatedPages($count, 0, function ($query) use ($user) {
+ $query->where('created_by', '=', $user->id);
+ }),
+ 'chapters' => $this->entityRepo->getRecentlyCreatedChapters($count, 0, function ($query) use ($user) {
+ $query->where('created_by', '=', $user->id);
+ }),
+ 'books' => $this->entityRepo->getRecentlyCreatedBooks($count, 0, function ($query) use ($user) {
+ $query->where('created_by', '=', $user->id);
+ })
];
}
public function getAssetCounts(User $user)
{
return [
- 'pages' => $this->entityRepo->page->where('created_by', '=', $user->id)->count(),
+ 'pages' => $this->entityRepo->page->where('created_by', '=', $user->id)->count(),
'chapters' => $this->entityRepo->chapter->where('created_by', '=', $user->id)->count(),
- 'books' => $this->entityRepo->book->where('created_by', '=', $user->id)->count(),
+ 'books' => $this->entityRepo->book->where('created_by', '=', $user->id)->count(),
];
}
+ /**
+ * Get all the roles which can be given restricted access to
+ * other entities in the system.
+ * @return mixed
+ */
+ public function getRestrictableRoles()
+ {
+ return $this->role->where('name', '!=', 'admin')->get();
+ }
+
}
\ No newline at end of file
--- /dev/null
+<?php
+
+namespace BookStack;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Restriction extends Model
+{
+
+ protected $fillable = ['role_id', 'action'];
+ public $timestamps = false;
+
+ /**
+ * Get all this restriction's attached entity.
+ * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+ */
+ public function restrictable()
+ {
+ return $this->morphTo();
+ }
+}
class Role extends Model
{
- /**
- * Sets the default role name for newly registered users.
- * @var string
- */
- protected static $default = 'viewer';
+
+ protected $fillable = ['display_name', 'description'];
/**
* The roles that belong to the role.
}
/**
- * Add a permission to this role.
- * @param Permission $permission
+ * Check if this role has a permission.
+ * @param $permission
*/
- public function attachPermission(Permission $permission)
+ public function hasPermission($permission)
{
- $this->permissions()->attach($permission->id);
+ return $this->permissions->pluck('name')->contains($permission);
}
/**
- * Get an instance of the default role.
- * @return Role
+ * Add a permission to this role.
+ * @param Permission $permission
*/
- public static function getDefault()
+ public function attachPermission(Permission $permission)
{
- return static::getRole(static::$default);
+ $this->permissions()->attach($permission->id);
}
/**
<?php namespace BookStack\Services;
-use Illuminate\Support\Facades\Auth;
use BookStack\Activity;
use BookStack\Entity;
use Session;
{
protected $activity;
protected $user;
+ protected $restrictionService;
/**
* ActivityService constructor.
- * @param $activity
+ * @param Activity $activity
+ * @param RestrictionService $restrictionService
*/
- public function __construct(Activity $activity)
+ public function __construct(Activity $activity, RestrictionService $restrictionService)
{
$this->activity = $activity;
+ $this->restrictionService = $restrictionService;
$this->user = auth()->user();
}
* Add activity data to database.
* @param Entity $entity
* @param $activityKey
- * @param int $bookId
- * @param bool $extra
+ * @param int $bookId
+ * @param bool $extra
*/
public function add(Entity $entity, $activityKey, $bookId = 0, $extra = false)
{
/**
* Adds a activity history with a message & without binding to a entity.
* @param $activityKey
- * @param int $bookId
+ * @param int $bookId
* @param bool|false $extra
*/
public function addMessage($activityKey, $bookId = 0, $extra = false)
*/
public function latest($count = 20, $page = 0)
{
- $activityList = $this->activity->orderBy('created_at', 'desc')
- ->skip($count * $page)->take($count)->get();
+ $activityList = $this->restrictionService
+ ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
+ ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
+
return $this->filterSimilar($activityList);
}
* Gets the latest activity for an entity, Filtering out similar
* items to prevent a message activity list.
* @param Entity $entity
- * @param int $count
- * @param int $page
+ * @param int $count
+ * @param int $page
* @return array
*/
public function entityActivity($entity, $count = 20, $page = 0)
*/
public function userActivity($user, $count = 20, $page = 0)
{
- $activity = $this->activity->where('user_id', '=', $user->id)
- ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
- return $this->filterSimilar($activity);
+ $activityList = $this->restrictionService
+ ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
+ ->orderBy('created_at', 'desc')->where('user_id', '=', $user->id)->skip($count * $page)->take($count)->get();
+ return $this->filterSimilar($activityList);
}
/**
'token' => $token,
]);
$this->mailer->send('emails/email-confirmation', ['token' => $token], function (Message $message) use ($user) {
- $appName = \Setting::get('app-name', 'BookStack');
+ $appName = setting('app-name', 'BookStack');
$message->to($user->email, $user->name)->subject('Confirm your email on ' . $appName . '.');
});
}
private function saveNew($imageName, $imageData, $type)
{
$storage = $this->getStorage();
- $secureUploads = Setting::get('app-secure-images');
+ $secureUploads = setting('app-secure-images');
$imageName = str_replace(' ', '-', $imageName);
if ($secureUploads) $imageName = str_random(16) . '-' . $imageName;
--- /dev/null
+<?php namespace BookStack\Services;
+
+use BookStack\Entity;
+
+class RestrictionService
+{
+
+ protected $userRoles;
+ protected $isAdmin;
+ protected $currentAction;
+
+ /**
+ * RestrictionService constructor.
+ */
+ public function __construct()
+ {
+ $user = auth()->user();
+ $this->userRoles = $user ? auth()->user()->roles->pluck('id') : [];
+ $this->isAdmin = $user ? auth()->user()->hasRole('admin') : false;
+ }
+
+ /**
+ * Checks if an entity has a restriction set upon it.
+ * @param Entity $entity
+ * @param $action
+ * @return bool
+ */
+ public function checkIfEntityRestricted(Entity $entity, $action)
+ {
+ if ($this->isAdmin) return true;
+ $this->currentAction = $action;
+ $baseQuery = $entity->where('id', '=', $entity->id);
+ if ($entity->isA('page')) {
+ return $this->pageRestrictionQuery($baseQuery)->count() > 0;
+ } elseif ($entity->isA('chapter')) {
+ return $this->chapterRestrictionQuery($baseQuery)->count() > 0;
+ } elseif ($entity->isA('book')) {
+ return $this->bookRestrictionQuery($baseQuery)->count() > 0;
+ }
+ return false;
+ }
+
+ /**
+ * Add restrictions for a page query
+ * @param $query
+ * @param string $action
+ * @return mixed
+ */
+ public function enforcePageRestrictions($query, $action = 'view')
+ {
+ if ($this->isAdmin) return $query;
+ $this->currentAction = $action;
+ return $this->pageRestrictionQuery($query);
+ }
+
+ /**
+ * The base query for restricting pages.
+ * @param $query
+ * @return mixed
+ */
+ private function pageRestrictionQuery($query)
+ {
+ return $query->where(function ($parentWhereQuery) {
+
+ $parentWhereQuery
+ // (Book & chapter & page) or (Book & page & NO CHAPTER) unrestricted
+ ->where(function ($query) {
+ $query->where(function ($query) {
+ $query->whereExists(function ($query) {
+ $query->select('*')->from('chapters')
+ ->whereRaw('chapters.id=pages.chapter_id')
+ ->where('restricted', '=', false);
+ })->whereExists(function ($query) {
+ $query->select('*')->from('books')
+ ->whereRaw('books.id=pages.book_id')
+ ->where('restricted', '=', false);
+ })->where('restricted', '=', false);
+ })->orWhere(function ($query) {
+ $query->where('restricted', '=', false)->where('chapter_id', '=', 0)
+ ->whereExists(function ($query) {
+ $query->select('*')->from('books')
+ ->whereRaw('books.id=pages.book_id')
+ ->where('restricted', '=', false);
+ });
+ });
+ })
+ // Page unrestricted, Has no chapter & book has accepted restrictions
+ ->orWhere(function ($query) {
+ $query->where('restricted', '=', false)
+ ->whereExists(function ($query) {
+ $query->select('*')->from('chapters')
+ ->whereRaw('chapters.id=pages.chapter_id');
+ }, 'and', true)
+ ->whereExists(function ($query) {
+ $query->select('*')->from('books')
+ ->whereRaw('books.id=pages.book_id')
+ ->whereExists(function ($query) {
+ $this->checkRestrictionsQuery($query, 'books', 'Book');
+ });
+ });
+ })
+ // Page unrestricted, Has an unrestricted chapter & book has accepted restrictions
+ ->orWhere(function ($query) {
+ $query->where('restricted', '=', false)
+ ->whereExists(function ($query) {
+ $query->select('*')->from('chapters')
+ ->whereRaw('chapters.id=pages.chapter_id')->where('restricted', '=', false);
+ })
+ ->whereExists(function ($query) {
+ $query->select('*')->from('books')
+ ->whereRaw('books.id=pages.book_id')
+ ->whereExists(function ($query) {
+ $this->checkRestrictionsQuery($query, 'books', 'Book');
+ });
+ });
+ })
+ // Page unrestricted, Has a chapter with accepted permissions
+ ->orWhere(function ($query) {
+ $query->where('restricted', '=', false)
+ ->whereExists(function ($query) {
+ $query->select('*')->from('chapters')
+ ->whereRaw('chapters.id=pages.chapter_id')
+ ->where('restricted', '=', true)
+ ->whereExists(function ($query) {
+ $this->checkRestrictionsQuery($query, 'chapters', 'Chapter');
+ });
+ });
+ })
+ // Page has accepted permissions
+ ->orWhereExists(function ($query) {
+ $this->checkRestrictionsQuery($query, 'pages', 'Page');
+ });
+ });
+ }
+
+ /**
+ * Add on permission restrictions to a chapter query.
+ * @param $query
+ * @param string $action
+ * @return mixed
+ */
+ public function enforceChapterRestrictions($query, $action = 'view')
+ {
+ if ($this->isAdmin) return $query;
+ $this->currentAction = $action;
+ return $this->chapterRestrictionQuery($query);
+ }
+
+ /**
+ * The base query for restricting chapters.
+ * @param $query
+ * @return mixed
+ */
+ private function chapterRestrictionQuery($query)
+ {
+ return $query->where(function ($parentWhereQuery) {
+
+ $parentWhereQuery
+ // Book & chapter unrestricted
+ ->where(function ($query) {
+ $query->where('restricted', '=', false)->whereExists(function ($query) {
+ $query->select('*')->from('books')
+ ->whereRaw('books.id=chapters.book_id')
+ ->where('restricted', '=', false);
+ });
+ })
+ // Chapter unrestricted & book has accepted restrictions
+ ->orWhere(function ($query) {
+ $query->where('restricted', '=', false)
+ ->whereExists(function ($query) {
+ $query->select('*')->from('books')
+ ->whereRaw('books.id=chapters.book_id')
+ ->whereExists(function ($query) {
+ $this->checkRestrictionsQuery($query, 'books', 'Book');
+ });
+ });
+ })
+ // Chapter has accepted permissions
+ ->orWhereExists(function ($query) {
+ $this->checkRestrictionsQuery($query, 'chapters', 'Chapter');
+ });
+ });
+ }
+
+ /**
+ * Add restrictions to a book query.
+ * @param $query
+ * @param string $action
+ * @return mixed
+ */
+ public function enforceBookRestrictions($query, $action = 'view')
+ {
+ if ($this->isAdmin) return $query;
+ $this->currentAction = $action;
+ return $this->bookRestrictionQuery($query);
+ }
+
+ /**
+ * The base query for restricting books.
+ * @param $query
+ * @return mixed
+ */
+ private function bookRestrictionQuery($query)
+ {
+ return $query->where(function ($parentWhereQuery) {
+ $parentWhereQuery
+ ->where('restricted', '=', false)
+ ->orWhere(function ($query) {
+ $query->where('restricted', '=', true)->whereExists(function ($query) {
+ $this->checkRestrictionsQuery($query, 'books', 'Book');
+ });
+ });
+ });
+ }
+
+ /**
+ * Filter items that have entities set a a polymorphic relation.
+ * @param $query
+ * @param string $tableName
+ * @param string $entityIdColumn
+ * @param string $entityTypeColumn
+ * @return mixed
+ */
+ public function filterRestrictedEntityRelations($query, $tableName, $entityIdColumn, $entityTypeColumn)
+ {
+ if ($this->isAdmin) return $query;
+ $this->currentAction = 'view';
+ $tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn, 'entityTypeColumn' => $entityTypeColumn];
+ return $query->where(function ($query) use ($tableDetails) {
+ $query->where(function ($query) use (&$tableDetails) {
+ $query->where($tableDetails['entityTypeColumn'], '=', 'BookStack\Page')
+ ->whereExists(function ($query) use (&$tableDetails) {
+ $query->select('*')->from('pages')->whereRaw('pages.id=' . $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+ ->where(function ($query) {
+ $this->pageRestrictionQuery($query);
+ });
+ });
+ })->orWhere(function ($query) use (&$tableDetails) {
+ $query->where($tableDetails['entityTypeColumn'], '=', 'BookStack\Book')->whereExists(function ($query) use (&$tableDetails) {
+ $query->select('*')->from('books')->whereRaw('books.id=' . $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+ ->where(function ($query) {
+ $this->bookRestrictionQuery($query);
+ });
+ });
+ })->orWhere(function ($query) use (&$tableDetails) {
+ $query->where($tableDetails['entityTypeColumn'], '=', 'BookStack\Chapter')->whereExists(function ($query) use (&$tableDetails) {
+ $query->select('*')->from('chapters')->whereRaw('chapters.id=' . $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+ ->where(function ($query) {
+ $this->chapterRestrictionQuery($query);
+ });
+ });
+ });
+ });
+ }
+
+ /**
+ * The query to check the restrictions on an entity.
+ * @param $query
+ * @param $tableName
+ * @param $modelName
+ */
+ private function checkRestrictionsQuery($query, $tableName, $modelName)
+ {
+ $query->select('*')->from('restrictions')
+ ->whereRaw('restrictions.restrictable_id=' . $tableName . '.id')
+ ->where('restrictions.restrictable_type', '=', 'BookStack\\' . $modelName)
+ ->where('restrictions.action', '=', $this->currentAction)
+ ->whereIn('restrictions.role_id', $this->userRoles);
+ }
+
+
+}
\ No newline at end of file
// Otherwise let the user know this social account is not used by anyone.
$message = 'This ' . $socialDriver . ' account is not linked to any users. Please attach it in your profile settings';
- if (\Setting::get('registration-enabled')) {
+ if (setting('registration-enabled')) {
$message .= ' or, If you do not yet have an account, You can register an account using the ' . $socialDriver . ' option';
}
throw new SocialSignInException($message . '.', '/login');
protected $view;
protected $user;
+ protected $restrictionService;
/**
* ViewService constructor.
- * @param $view
+ * @param View $view
+ * @param RestrictionService $restrictionService
*/
- public function __construct(View $view)
+ public function __construct(View $view, RestrictionService $restrictionService)
{
$this->view = $view;
$this->user = auth()->user();
+ $this->restrictionService = $restrictionService;
}
/**
*/
public function add(Entity $entity)
{
- if($this->user === null) return 0;
+ if ($this->user === null) return 0;
$view = $entity->views()->where('user_id', '=', $this->user->id)->first();
// Add view if model exists
if ($view) {
/**
* Get the entities with the most views.
- * @param int $count
- * @param int $page
+ * @param int $count
+ * @param int $page
* @param bool|false $filterModel
*/
public function getPopular($count = 10, $page = 0, $filterModel = false)
{
$skipCount = $count * $page;
- $query = $this->view->select('id', 'viewable_id', 'viewable_type', \DB::raw('SUM(views) as view_count'))
+ $query = $this->restrictionService->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type')
+ ->select('id', 'viewable_id', 'viewable_type', \DB::raw('SUM(views) as view_count'))
->groupBy('viewable_id', 'viewable_type')
->orderBy('view_count', 'desc');
- if($filterModel) $query->where('viewable_type', '=', get_class($filterModel));
+ if ($filterModel) $query->where('viewable_type', '=', get_class($filterModel));
$views = $query->with('viewable')->skip($skipCount)->take($count)->get();
$viewedEntities = $views->map(function ($item) {
/**
* Get all recently viewed entities for the current user.
- * @param int $count
- * @param int $page
+ * @param int $count
+ * @param int $page
* @param Entity|bool $filterModel
* @return mixed
*/
public function getUserRecentlyViewed($count = 10, $page = 0, $filterModel = false)
{
- if($this->user === null) return collect();
+ if ($this->user === null) return collect();
$skipCount = $count * $page;
- $query = $this->view->where('user_id', '=', auth()->user()->id);
+ $query = $this->restrictionService
+ ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
- if ($filterModel) $query->where('viewable_type', '=', get_class($filterModel));
+ if ($filterModel) $query = $query->where('viewable_type', '=', get_class($filterModel));
+ $query = $query->where('user_id', '=', auth()->user()->id);
$views = $query->with('viewable')->orderBy('updated_at', 'desc')->skip($skipCount)->take($count)->get();
$viewedEntities = $views->map(function ($item) {
- return $item->viewable()->getResults();
+ return $item->viewable;
});
return $viewedEntities;
}
/**
* The database table used by the model.
- *
* @var string
*/
protected $table = 'users';
/**
* The attributes that are mass assignable.
- *
* @var array
*/
protected $fillable = ['name', 'email', 'image_id'];
/**
* The attributes excluded from the model's JSON form.
- *
* @var array
*/
protected $hidden = ['password', 'remember_token'];
]);
}
- /**
- * Permissions and roles
- */
-
/**
* The roles that belong to the user.
*/
return $this->belongsToMany('BookStack\Role');
}
- public function getRoleAttribute()
+ /**
+ * Check if the user has a role.
+ * @param $role
+ * @return mixed
+ */
+ public function hasRole($role)
{
- return $this->roles()->with('permissions')->first();
+ return $this->roles->pluck('name')->contains($role);
}
/**
- * Loads the user's permissions from their role.
+ * Get all permissions belonging to a the current user.
+ * @param bool $cache
+ * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
*/
- private function loadPermissions()
+ public function permissions($cache = true)
{
- if (isset($this->permissions)) return;
+ if(isset($this->permissions) && $cache) return $this->permissions;
$this->load('roles.permissions');
- $permissions = $this->roles[0]->permissions;
- $permissionsArray = $permissions->pluck('name')->all();
- $this->permissions = $permissionsArray;
+ $permissions = $this->roles->map(function($role) {
+ return $role->permissions;
+ })->flatten()->unique();
+ $this->permissions = $permissions;
+ return $permissions;
}
/**
*/
public function can($permissionName)
{
- if ($this->email == 'guest') {
- return false;
- }
- $this->loadPermissions();
- return array_search($permissionName, $this->permissions) !== false;
+ if ($this->email === 'guest') return false;
+ return $this->permissions()->pluck('name')->contains($permissionName);
}
/**
*/
public function attachRoleId($id)
{
- $this->roles()->sync([$id]);
+ $this->roles()->attach($id);
}
/**
* Get the social account associated with this user.
- *
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function socialAccounts()
/**
* Returns the user's avatar,
- * Uses Gravatar as the avatar service.
- *
* @param int $size
* @return string
*/
<?php
-if (! function_exists('versioned_asset')) {
+if (!function_exists('versioned_asset')) {
/**
* Get the path to a versioned file.
*
- * @param string $file
+ * @param string $file
* @return string
*
* @throws \InvalidArgumentException
throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
}
-}
\ No newline at end of file
+}
+
+/**
+ * Check if the current user has a permission.
+ * If an ownable element is passed in the permissions are checked against
+ * that particular item.
+ * @param $permission
+ * @param \BookStack\Ownable $ownable
+ * @return mixed
+ */
+function userCan($permission, \BookStack\Ownable $ownable = null)
+{
+ if (!auth()->check()) return false;
+ if ($ownable === null) {
+ return auth()->user() && auth()->user()->can($permission);
+ }
+
+ // Check permission on ownable item
+ $permissionBaseName = strtolower($permission) . '-';
+ $hasPermission = false;
+ if (auth()->user()->can($permissionBaseName . 'all')) $hasPermission = true;
+ if (auth()->user()->can($permissionBaseName . 'own') && $ownable->createdBy && $ownable->createdBy->id === auth()->user()->id) $hasPermission = true;
+
+ if (!$ownable instanceof \BookStack\Entity) return $hasPermission;
+
+ // Check restrictions on the entitiy
+ $restrictionService = app('BookStack\Services\RestrictionService');
+ $explodedPermission = explode('-', $permission);
+ $action = end($explodedPermission);
+ $hasAccess = $restrictionService->checkIfEntityRestricted($ownable, $action);
+ return $hasAccess && $hasPermission;
+}
+
+/**
+ * Helper to access system settings.
+ * @param $key
+ * @param bool $default
+ * @return mixed
+ */
+function setting($key, $default = false)
+{
+ $settingService = app('BookStack\Services\SettingService');
+ return $settingService->get($key, $default);
+}
<?php
+// MEMCACHED - Split out configuration into an array
+if (env('CACHE_DRIVER') === 'memcached') {
+ $memcachedServerKeys = ['host', 'port', 'weight'];
+ $memcachedServers = explode(',', trim(env('MEMCACHED_SERVERS', '127.0.0.1:11211:100'), ','));
+ foreach ($memcachedServers as $index => $memcachedServer) {
+ $memcachedServerDetails = explode(':', $memcachedServer);
+ $components = count($memcachedServerDetails);
+ if ($components < 2) $memcachedServerDetails[] = '11211';
+ if ($components < 3) $memcachedServerDetails[] = '100';
+ $memcachedServers[$index] = array_combine($memcachedServerKeys, $memcachedServerDetails);
+ }
+}
+
return [
/*
'memcached' => [
'driver' => 'memcached',
- 'servers' => [
- [
- 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
- ],
- ],
+ 'servers' => env('CACHE_DRIVER') === 'memcached' ? $memcachedServers : [],
],
'redis' => [
'email' => $faker->email,
'password' => str_random(10),
'remember_token' => str_random(10),
+ 'email_confirmed' => 1
];
});
'text' => strip_tags($html)
];
});
+
+$factory->define(BookStack\Role::class, function ($faker) {
+ return [
+ 'display_name' => $faker->sentence(3),
+ 'description' => $faker->sentence(10)
+ ];
+});
\ No newline at end of file
--- /dev/null
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdatePermissionsAndRoles extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ // Get roles with permissions we need to change
+ $adminRole = \BookStack\Role::getRole('admin');
+ $editorRole = \BookStack\Role::getRole('editor');
+
+ // Delete old permissions
+ $permissions = \BookStack\Permission::all();
+ $permissions->each(function ($permission) {
+ $permission->delete();
+ });
+
+ // Create & attach new admin permissions
+ $permissionsToCreate = [
+ 'settings-manage' => 'Manage Settings',
+ 'users-manage' => 'Manage Users',
+ 'user-roles-manage' => 'Manage Roles & Permissions',
+ 'restrictions-manage-all' => 'Manage All Entity Restrictions',
+ 'restrictions-manage-own' => 'Manage Entity Restrictions On Own Content'
+ ];
+ foreach ($permissionsToCreate as $name => $displayName) {
+ $newPermission = new \BookStack\Permission();
+ $newPermission->name = $name;
+ $newPermission->display_name = $displayName;
+ $newPermission->save();
+ $adminRole->attachPermission($newPermission);
+ }
+
+ // Create & attach new entity permissions
+ $entities = ['Book', 'Page', 'Chapter', 'Image'];
+ $ops = ['Create All', 'Create Own', 'Update All', 'Update Own', 'Delete All', 'Delete Own'];
+ foreach ($entities as $entity) {
+ foreach ($ops as $op) {
+ $newPermission = new \BookStack\Permission();
+ $newPermission->name = strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op));
+ $newPermission->display_name = $op . ' ' . $entity . 's';
+ $newPermission->save();
+ $adminRole->attachPermission($newPermission);
+ if ($editorRole !== null) $editorRole->attachPermission($newPermission);
+ }
+ }
+
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ // Get roles with permissions we need to change
+ $adminRole = \BookStack\Role::getRole('admin');
+
+ // Delete old permissions
+ $permissions = \BookStack\Permission::all();
+ $permissions->each(function ($permission) {
+ $permission->delete();
+ });
+
+ // Create default CRUD permissions and allocate to admins and editors
+ $entities = ['Book', 'Page', 'Chapter', 'Image'];
+ $ops = ['Create', 'Update', 'Delete'];
+ foreach ($entities as $entity) {
+ foreach ($ops as $op) {
+ $newPermission = new \BookStack\Permission();
+ $newPermission->name = strtolower($entity) . '-' . strtolower($op);
+ $newPermission->display_name = $op . ' ' . $entity . 's';
+ $newPermission->save();
+ $adminRole->attachPermission($newPermission);
+ }
+ }
+
+ // Create admin permissions
+ $entities = ['Settings', 'User'];
+ $ops = ['Create', 'Update', 'Delete'];
+ foreach ($entities as $entity) {
+ foreach ($ops as $op) {
+ $newPermission = new \BookStack\Permission();
+ $newPermission->name = strtolower($entity) . '-' . strtolower($op);
+ $newPermission->display_name = $op . ' ' . $entity;
+ $newPermission->save();
+ $adminRole->attachPermission($newPermission);
+ }
+ }
+ }
+}
--- /dev/null
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddEntityAccessControls extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::table('images', function (Blueprint $table) {
+ $table->integer('uploaded_to')->default(0);
+ $table->index('uploaded_to');
+ });
+
+ Schema::table('books', function (Blueprint $table) {
+ $table->boolean('restricted')->default(false);
+ $table->index('restricted');
+ });
+
+ Schema::table('chapters', function (Blueprint $table) {
+ $table->boolean('restricted')->default(false);
+ $table->index('restricted');
+ });
+
+ Schema::table('pages', function (Blueprint $table) {
+ $table->boolean('restricted')->default(false);
+ $table->index('restricted');
+ });
+
+ Schema::create('restrictions', function(Blueprint $table) {
+ $table->increments('id');
+ $table->integer('restrictable_id');
+ $table->string('restrictable_type');
+ $table->integer('role_id');
+ $table->string('action');
+ $table->index('role_id');
+ $table->index('action');
+ $table->index(['restrictable_id', 'restrictable_type']);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('images', function (Blueprint $table) {
+ $table->dropColumn('uploaded_to');
+ });
+
+ Schema::table('books', function (Blueprint $table) {
+ $table->dropColumn('restricted');
+ });
+
+ Schema::table('chapters', function (Blueprint $table) {
+ $table->dropColumn('restricted');
+ });
+
+
+ Schema::table('pages', function (Blueprint $table) {
+ $table->dropColumn('restricted');
+ });
+
+ Schema::drop('restrictions');
+ }
+}
public function run()
{
$user = factory(BookStack\User::class, 1)->create();
- $role = \BookStack\Role::getDefault();
+ $role = \BookStack\Role::getRole('editor');
$user->attachRole($role);
</filter>
<php>
<env name="APP_ENV" value="testing"/>
+ <env name="APP_DEBUG" value="false"/>
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
--- /dev/null
+/*! tinyColorPicker - v1.0.0 2016-02-28 */
+// https://github.com/PitPik/tinyColorPicker
+// http://www.dematte.at/tinyColorPicker/index.html?type=small#demo
+!function(a,b){"object"==typeof exports?module.exports=b(a):"function"==typeof define&&define.amd?define([],function(){return b(a)}):a.Colors=b(a)}(this,function(a,b){"use strict";function c(a,c,d,f,g){if("string"==typeof c){var c=t.txt2color(c);d=c.type,n[d]=c[d],g=g!==b?g:c.alpha}else if(c)for(var h in c)a[d][h]=k(c[h]/l[d][h][1],0,1);return g!==b&&(a.alpha=k(+g,0,1)),e(d,f?a:b)}function d(a,b,c){var d=m.options.grey,e={};return e.RGB={r:a.r,g:a.g,b:a.b},e.rgb={r:b.r,g:b.g,b:b.b},e.alpha=c,e.equivalentGrey=Math.round(d.r*a.r+d.g*a.g+d.b*a.b),e.rgbaMixBlack=i(b,{r:0,g:0,b:0},c,1),e.rgbaMixWhite=i(b,{r:1,g:1,b:1},c,1),e.rgbaMixBlack.luminance=h(e.rgbaMixBlack,!0),e.rgbaMixWhite.luminance=h(e.rgbaMixWhite,!0),m.options.customBG&&(e.rgbaMixCustom=i(b,m.options.customBG,c,1),e.rgbaMixCustom.luminance=h(e.rgbaMixCustom,!0),m.options.customBG.luminance=h(m.options.customBG,!0)),e}function e(a,b){var c,e,k,o=b||n,p=t,q=m.options,r=l,s=o.RND,u="",v="",w={hsl:"hsv",rgb:a},x=s.rgb;if("alpha"!==a){for(var y in r)if(!r[y][y]){a!==y&&(v=w[y]||"rgb",o[y]=p[v+"2"+y](o[v])),s[y]||(s[y]={}),c=o[y];for(u in c)s[y][u]=Math.round(c[u]*r[y][u][1])}x=s.rgb,o.HEX=p.RGB2HEX(x),o.equivalentGrey=q.grey.r*o.rgb.r+q.grey.g*o.rgb.g+q.grey.b*o.rgb.b,o.webSave=e=f(x,51),o.webSmart=k=f(x,17),o.saveColor=x.r===e.r&&x.g===e.g&&x.b===e.b?"web save":x.r===k.r&&x.g===k.g&&x.b===k.b?"web smart":"",o.hueRGB=t.hue2RGB(o.hsv.h),b&&(o.background=d(x,o.rgb,o.alpha))}var z,A,B,C=o.rgb,D=o.alpha,E="luminance",F=o.background;return z=i(C,{r:0,g:0,b:0},D,1),z[E]=h(z,!0),o.rgbaMixBlack=z,A=i(C,{r:1,g:1,b:1},D,1),A[E]=h(A,!0),o.rgbaMixWhite=A,q.customBG&&(B=i(C,F.rgbaMixCustom,D,1),B[E]=h(B,!0),B.WCAG2Ratio=j(B[E],F.rgbaMixCustom[E]),o.rgbaMixBGMixCustom=B,B.luminanceDelta=Math.abs(B[E]-F.rgbaMixCustom[E]),B.hueDelta=g(F.rgbaMixCustom,B,!0)),o.RGBLuminance=h(x),o.HUELuminance=h(o.hueRGB),q.convertCallback&&q.convertCallback(o,a),o}function f(a,b){var c={},d=0,e=b/2;for(var f in a)d=a[f]%b,c[f]=a[f]+(d>e?b-d:-d);return c}function g(a,b,c){return(Math.max(a.r-b.r,b.r-a.r)+Math.max(a.g-b.g,b.g-a.g)+Math.max(a.b-b.b,b.b-a.b))*(c?255:1)/765}function h(a,b){for(var c=b?1:255,d=[a.r/c,a.g/c,a.b/c],e=m.options.luminance,f=d.length;f--;)d[f]=d[f]<=.03928?d[f]/12.92:Math.pow((d[f]+.055)/1.055,2.4);return e.r*d[0]+e.g*d[1]+e.b*d[2]}function i(a,c,d,e){var f={},g=d!==b?d:1,h=e!==b?e:1,i=g+h*(1-g);for(var j in a)f[j]=(a[j]*g+c[j]*h*(1-g))/i;return f.a=i,f}function j(a,b){var c=1;return c=a>=b?(a+.05)/(b+.05):(b+.05)/(a+.05),Math.round(100*c)/100}function k(a,b,c){return a>c?c:b>a?b:a}var l={rgb:{r:[0,255],g:[0,255],b:[0,255]},hsv:{h:[0,360],s:[0,100],v:[0,100]},hsl:{h:[0,360],s:[0,100],l:[0,100]},alpha:{alpha:[0,1]},HEX:{HEX:[0,16777215]}},m={},n={},o={r:.298954,g:.586434,b:.114612},p={r:.2126,g:.7152,b:.0722},q=function(a){this.colors={RND:{}},this.options={color:"rgba(204, 82, 37, 0.8)",grey:o,luminance:p,valueRanges:l},r(this,a||{})},r=function(a,d){var e,f=a.options;s(a);for(var g in d)d[g]!==b&&(f[g]=d[g]);e=f.customBG,f.customBG="string"==typeof e?t.txt2color(e).rgb:e,n=c(a.colors,f.color,b,!0)},s=function(a){m!==a&&(m=a,n=a.colors)};q.prototype.setColor=function(a,d,f){return s(this),a?c(this.colors,a,d,b,f):(f!==b&&(this.colors.alpha=k(f,0,1)),e(d))},q.prototype.setCustomBackground=function(a){return s(this),this.options.customBG="string"==typeof a?t.txt2color(a).rgb:a,c(this.colors,b,"rgb")},q.prototype.saveAsBackground=function(){return s(this),c(this.colors,b,"rgb",!0)};var t={txt2color:function(a){var b={},c=a.replace(/(?:#|\)|%)/g,"").split("("),d=(c[1]||"").split(/,\s*/),e=c[1]?c[0].substr(0,3):"rgb",f="";if(b.type=e,b[e]={},c[1])for(var g=3;g--;)f=e[g]||e.charAt(g),b[e][f]=+d[g]/l[e][f][1];else b.rgb=t.HEX2rgb(c[0]);return b.alpha=d[3]?+d[3]:1,b},RGB2HEX:function(a){return((a.r<16?"0":"")+a.r.toString(16)+(a.g<16?"0":"")+a.g.toString(16)+(a.b<16?"0":"")+a.b.toString(16)).toUpperCase()},HEX2rgb:function(a){return a=a.split(""),{r:parseInt(a[0]+a[a[3]?1:0],16)/255,g:parseInt(a[a[3]?2:1]+(a[3]||a[1]),16)/255,b:parseInt((a[4]||a[2])+(a[5]||a[2]),16)/255}},hue2RGB:function(a){var b=6*a,c=~~b%6,d=6===b?0:b-c;return{r:Math.round(255*[1,1-d,0,0,d,1][c]),g:Math.round(255*[d,1,1,1-d,0,0][c]),b:Math.round(255*[0,0,d,1,1,1-d][c])}},rgb2hsv:function(a){var b,c,d,e=a.r,f=a.g,g=a.b,h=0;return g>f&&(f=g+(g=f,0),h=-1),c=g,f>e&&(e=f+(f=e,0),h=-2/6-h,c=Math.min(f,g)),b=e-c,d=e?b/e:0,{h:1e-15>d?n&&n.hsl&&n.hsl.h||0:b?Math.abs(h+(f-g)/(6*b)):0,s:e?b/e:n&&n.hsv&&n.hsv.s||0,v:e}},hsv2rgb:function(a){var b=6*a.h,c=a.s,d=a.v,e=~~b,f=b-e,g=d*(1-c),h=d*(1-f*c),i=d*(1-(1-f)*c),j=e%6;return{r:[d,h,g,g,i,d][j],g:[i,d,d,h,g,g][j],b:[g,g,i,d,d,h][j]}},hsv2hsl:function(a){var b=(2-a.s)*a.v,c=a.s*a.v;return c=a.s?1>b?b?c/b:0:c/(2-b):0,{h:a.h,s:a.v||c?c:n&&n.hsl&&n.hsl.s||0,l:b/2}},rgb2hsl:function(a,b){var c=t.rgb2hsv(a);return t.hsv2hsl(b?c:n.hsv=c)},hsl2rgb:function(a){var b=6*a.h,c=a.s,d=a.l,e=.5>d?d*(1+c):d+c-c*d,f=d+d-e,g=e?(e-f)/e:0,h=~~b,i=b-h,j=e*g*i,k=f+j,l=e-j,m=h%6;return{r:[e,l,f,f,k,e][m],g:[k,e,e,l,f,f][m],b:[f,f,k,e,e,l][m]}}};return q}),function(a,b){"object"==typeof exports?module.exports=b(a,require("jquery"),require("colors")):"function"==typeof define&&define.amd?define(["jquery","colors"],function(c,d){return b(a,c,d)}):b(a,a.jQuery,a.Colors)}(this,function(a,b,c,d){"use strict";function e(a){return a.value||a.getAttribute("value")||b(a).css("background-color")||"#fff"}function f(a){return a=a.originalEvent&&a.originalEvent.touches?a.originalEvent.touches[0]:a,a.originalEvent?a.originalEvent:a}function g(a){return b(a.find(r.doRender)[0]||a[0])}function h(c){var d=b(this),f=d.offset(),h=b(a),j=r.gap;c?(s=g(d),s._colorMode=s.data("colorMode"),p.$trigger=d,(t||i()).css({left:(t[0]._left=f.left)-((t[0]._left=t[0]._left+t[0]._width-(h.scrollLeft()+h.width()))+j>0?t[0]._left+j:0),top:(t[0]._top=f.top+d.outerHeight())-((t[0]._top=t[0]._top+t[0]._height-(h.scrollTop()+h.height()))+j>0?t[0]._top+j:0)}).show(r.animationSpeed,function(){c!==!0&&(x._width=x.width(),u._width=u.width(),u._height=u.height(),q.setColor(e(s[0])),n(!0))})):b(t).hide(r.animationSpeed,function(){n(!1),p.$trigger=null})}function i(){return b("head").append('<style type="text/css">'+(r.css||I)+(r.cssAddon||"")+"</style>"),p.$UI=t=b(H).css({margin:r.margin}).appendTo("body").show(0,function(){var a=b(this);E=r.GPU&&a.css("perspective")!==d,u=b(".cp-xy-slider",this),v=b(".cp-xy-cursor",this),w=b(".cp-z-cursor",this),x=b(".cp-alpha",this).toggle(!!r.opacity),y=b(".cp-alpha-cursor",this),r.buildCallback.call(p,a),a.prepend("<div>").children().eq(0).css("width",a.children().eq(0).width()),this._width=this.offsetWidth,this._height=this.offsetHeight}).hide().on(C,".cp-xy-slider,.cp-z-slider,.cp-alpha",j)}function j(a){var c=this.className.replace(/cp-(.*?)(?:\s*|$)/,"$1").replace("-","_");(a.button||a.which)>1||(a.preventDefault&&a.preventDefault(),a.returnValue=!1,s._offset=b(this).offset(),(c="xy_slider"===c?k:"z_slider"===c?l:m)(a),n(),z.on(D,function(){z.off(".a")}).on(B,function(a){c(a),n()}))}function k(a){var b=f(a),c=b.pageX-s._offset.left,d=b.pageY-s._offset.top;q.setColor({s:c/u._width*100,v:100-d/u._height*100},"hsv")}function l(a){var b=f(a).pageY-s._offset.top;q.setColor({h:360-b/u._height*360},"hsv")}function m(a){var b=f(a).pageX-s._offset.left,c=b/x._width;q.setColor({},"rgb",c)}function n(a){var b=q.colors,c=b.hueRGB,e=b.RND.rgb,f=b.RND.hsl,g="#222",h="#ddd",i=s._colorMode,j=1!==b.alpha,k=F(100*b.alpha)/100,l=e.r+", "+e.g+", "+e.b,m="HEX"!==i||j?"rgb"===i||"HEX"===i&&j?j?"rgba("+l+", "+k+")":"rgb("+l+")":"hsl"+(j?"a(":"(")+f.h+", "+f.s+"%, "+f.l+"%"+(j?", "+k:"")+")":"#"+b.HEX,n=b.HUELuminance>.22?g:h,p=b.rgbaMixBlack.luminance>.22?g:h,r=(1-b.hsv.h)*u._height,t=b.hsv.s*u._width,z=(1-b.hsv.v)*u._height,A=k*x._width,B=E?"translate3d":"",C=s[0].value,D=s[0].hasAttribute("value")&&""===C&&a!==d;u._css={backgroundColor:"rgb("+c.r+","+c.g+","+c.b+")"},v._css={transform:B+"("+t+"px, "+z+"px, 0)",left:E?"":t,top:E?"":z,borderColor:b.RGBLuminance>.22?g:h},w._css={transform:B+"(0, "+r+"px, 0)",top:E?"":r,borderColor:"transparent "+n},x._css={backgroundColor:"rgb("+l+")"},y._css={transform:B+"("+A+"px, 0, 0)",left:E?"":A,borderColor:p+" transparent"},s._css={backgroundColor:D?"":m,color:D?"":b.rgbaMixBGMixCustom.luminance>.22?g:h},s.text=D?"":C!==m?m:"",a!==d?o(a):G(o)}function o(a){u.css(u._css),v.css(v._css),w.css(w._css),x.css(x._css),y.css(y._css),r.doRender&&s.css(s._css),s.text&&s.val(s.text),r.renderCallback.call(p,s,"boolean"==typeof a?a:d)}var p,q,r,s,t,u,v,w,x,y,z=b(document),A=b(),B="touchmove.a mousemove.a pointermove.a",C="touchstart.a mousedown.a pointerdown.a",D="touchend.a mouseup.a pointerup.a",E=!1,F=Math.round,G=a.requestAnimationFrame||a.webkitRequestAnimationFrame||function(a){a()},H='<div class="cp-color-picker"><div class="cp-z-slider"><div class="cp-z-cursor"></div></div><div class="cp-xy-slider"><div class="cp-white"></div><div class="cp-xy-cursor"></div></div><div class="cp-alpha"><div class="cp-alpha-cursor"></div></div></div>',I=".cp-color-picker{position:absolute;overflow:hidden;padding:6px 6px 0;background-color:#444;color:#bbb;font-family:Arial,Helvetica,sans-serif;font-size:12px;font-weight:400;cursor:default;border-radius:5px}.cp-color-picker>div{position:relative;overflow:hidden}.cp-xy-slider{float:left;height:128px;width:128px;margin-bottom:6px;background:linear-gradient(to right,#FFF,rgba(255,255,255,0))}.cp-white{height:100%;width:100%;background:linear-gradient(rgba(0,0,0,0),#000)}.cp-xy-cursor{position:absolute;top:0;width:10px;height:10px;margin:-5px;border:1px solid #fff;border-radius:100%;box-sizing:border-box}.cp-z-slider{float:right;margin-left:6px;height:128px;width:20px;background:linear-gradient(red 0,#f0f 17%,#00f 33%,#0ff 50%,#0f0 67%,#ff0 83%,red 100%)}.cp-z-cursor{position:absolute;margin-top:-4px;width:100%;border:4px solid #fff;border-color:transparent #fff;box-sizing:border-box}.cp-alpha{clear:both;width:100%;height:16px;margin:6px 0;background:linear-gradient(to right,#444,rgba(0,0,0,0))}.cp-alpha-cursor{position:absolute;margin-left:-4px;height:100%;border:4px solid #fff;border-color:#fff transparent;box-sizing:border-box}",J=function(a){q=this.color=new c(a),r=q.options,p=this};return J.prototype={render:n,toggle:h},b.fn.colorPicker=function(c){var d=function(){};return c=b.extend({animationSpeed:150,GPU:!0,doRender:!0,customBG:"#FFF",opacity:!0,renderCallback:d,buildCallback:d,body:document.body,scrollResize:!0,gap:4},c),!p&&c.scrollResize&&b(a).on("resize.a scroll.a",function(){p.$trigger&&p.toggle.call(p.$trigger[0],!0)}),A=A.add(this),this.colorPicker=A.colorPicker=p||new J(c),b(c.body).off(".a").on(C,function(a){!A.add(t).find(a.target).add(A.filter(a.target))[0]&&h()}),this.on("focusin.a click.a",h).on("change.a",function(){q.setColor(this.value||"#FFF"),A.colorPicker.render(!0)}).each(function(){var a=e(this),d=a.split("("),f=g(b(this));f.data("colorMode",d[1]?d[0].substr(0,3):"HEX").attr("readonly",r.preventFocus),c.doRender&&f.css({"background-color":a,color:function(){return q.setColor(a).rgbaMixBGMixCustom.luminance>.22?"#222":"#ddd"}})})},b.fn.colorPicker.destroy=function(){A.add(r.body).off(".a"),p.toggle(!1),A=b()},b});
\ No newline at end of file
* [Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font/icons.html)
* [Dropzone.js](http://www.dropzonejs.com/)
* [ZeroClipboard](http://zeroclipboard.org/)
+* [TinyColorPicker](http://www.dematte.at/tinyColorPicker/index.html)
page++;
});
}
+
$scope.fetchData = fetchData;
/**
$http.put(url, this.selectedImage).then((response) => {
events.emit('success', 'Image details updated');
}, (response) => {
- var errors = response.data;
- var message = '';
- Object.keys(errors).forEach((key) => {
- message += errors[key].join('\n');
- });
- events.emit('error', message);
+ if (response.status === 422) {
+ var errors = response.data;
+ var message = '';
+ Object.keys(errors).forEach((key) => {
+ message += errors[key].join('\n');
+ });
+ events.emit('error', message);
+ } else if (response.status === 403) {
+ events.emit('error', response.data.error);
+ }
});
};
// Pages failure
if (response.status === 400) {
$scope.dependantPages = response.data;
+ } else if (response.status === 403) {
+ events.emit('error', response.data.error);
}
});
};
* @param stringDate
* @returns {Date}
*/
- $scope.getDate = function(stringDate) {
+ $scope.getDate = function (stringDate) {
return new Date(stringDate);
};
scrollTop.style.display = 'block';
scrollTopShowing = true;
setTimeout(() => {
- scrollTop.style.opacity = 1;
+ scrollTop.style.opacity = 0.4;
}, 1);
} else if (scrollTopShowing && document.body.scrollTop < scrollTopBreakpoint) {
scrollTop.style.opacity = 0;
padding-top: $-s;
}
}
+ .dropdown-container {
+ font-size: 0.9em;
+ }
}
form.search-box {
// Sidebar list
.book-tree {
- padding: $-xl 0 0 0;
+ padding: $-l 0 0 0;
position: relative;
right: 0;
top: 0;
transition: ease-in-out 240ms;
transition-property: right, border;
border-left: 0px solid #FFF;
+ background-color: #FFF;
&.fixed {
position: fixed;
top: 0;
// Back to top link
$btt-size: 40px;
#back-to-top {
- background-color: rgba($primary, 0.4);
+ background-color: $primary;
position: fixed;
bottom: $-m;
right: $-l;
overflow: hidden;
&:hover {
width: $btt-size*3.4;
- background-color: rgba($primary, 1);
+ opacity: 1 !important;
span {
display: inline-block;
}
// Pages
'permission' => 'You do not have permission to access the requested page.',
+ 'permissionJson' => 'You do not have permission to perform the requested action.'
];
\ No newline at end of file
<!DOCTYPE html>
<html>
<head>
- <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ Setting::get('app-name', 'BookStack') }}</title>
+ <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name', 'BookStack') }}</title>
<!-- Meta -->
<meta name="viewport" content="width=device-width">
<script src="/libs/jquery/jquery.min.js?version=2.1.4"></script>
@yield('head')
+
+ @include('partials/custom-styles')
</head>
<body class="@yield('body-class')" ng-app="bookStack">
<div class="row">
<div class="col-lg-4 col-sm-4" ng-non-bindable>
<a href="/" class="logo">
- @if(Setting::get('app-logo', '') !== 'none')
- <img class="logo-image" src="{{ Setting::get('app-logo', '') === '' ? '/logo.png' : Setting::get('app-logo', '') }}" alt="Logo">
+ @if(setting('app-logo', '') !== 'none')
+ <img class="logo-image" src="{{ setting('app-logo', '') === '' ? '/logo.png' : setting('app-logo', '') }}" alt="Logo">
@endif
- <span class="logo-text">{{ Setting::get('app-name', 'BookStack') }}</span>
+ <span class="logo-text">{{ setting('app-name', 'BookStack') }}</span>
</a>
</div>
<div class="col-lg-4 col-sm-3 text-center">
<div class="float right">
<div class="links text-center">
<a href="/books"><i class="zmdi zmdi-book"></i>Books</a>
- @if(isset($currentUser) && $currentUser->can('settings-update'))
+ @if(isset($currentUser) && userCan('settings-manage'))
<a href="/settings"><i class="zmdi zmdi-settings"></i>Settings</a>
@endif
@if(!isset($signedIn) || !$signedIn)
<div class="col-xs-1"></div>
<div class="col-xs-11 faded">
<div class="action-buttons">
- @if($currentUser->can('book-create'))
+ @if($currentUser->can('book-create-all'))
<a href="/books/create" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>Add new book</a>
@endif
</div>
{!! $books->render() !!}
@else
<p class="text-muted">No books have been created.</p>
- <a href="/books/create" class="text-pos"><i class="zmdi zmdi-edit"></i>Create one now</a>
+ @if(userCan('books-create-all'))
+ <a href="/books/create" class="text-pos"><i class="zmdi zmdi-edit"></i>Create one now</a>
+ @endif
@endif
</div>
<div class="col-sm-4 col-sm-offset-1">
--- /dev/null
+@extends('base')
+
+@section('content')
+
+ <div class="faded-small toolbar">
+ <div class="container">
+ <div class="row">
+ <div class="col-sm-12 faded">
+ <div class="breadcrumbs">
+ <a href="{{$book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $book->getShortName() }}</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="container" ng-non-bindable>
+ <h1>Book Restrictions</h1>
+ @include('form/restriction-form', ['model' => $book])
+ </div>
+
+@stop
@section('content')
- <div class="faded-small toolbar" ng-non-bindable>
+ <div class="faded-small toolbar">
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="action-buttons faded">
- @if($currentUser->can('page-create'))
+ @if(userCan('page-create', $book))
<a href="{{$book->getUrl() . '/page/create'}}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i> New Page</a>
@endif
- @if($currentUser->can('chapter-create'))
+ @if(userCan('chapter-create', $book))
<a href="{{$book->getUrl() . '/chapter/create'}}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i> New Chapter</a>
@endif
- @if($currentUser->can('book-update'))
+ @if(userCan('book-update', $book))
<a href="{{$book->getEditUrl()}}" class="text-primary text-button"><i class="zmdi zmdi-edit"></i>Edit</a>
- <a href="{{ $book->getUrl() }}/sort" class="text-primary text-button"><i class="zmdi zmdi-sort"></i>Sort</a>
@endif
- @if($currentUser->can('book-delete'))
- <a href="{{ $book->getUrl() }}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete</a>
+ @if(userCan('book-update', $book) || userCan('restrictions-manage', $book) || userCan('book-delete', $book))
+ <div dropdown class="dropdown-container">
+ <a dropdown-toggle class="text-primary text-button"><i class="zmdi zmdi-more-vert"></i></a>
+ <ul>
+ @if(userCan('book-update', $book))
+ <li><a href="{{ $book->getUrl() }}/sort" class="text-primary"><i class="zmdi zmdi-sort"></i>Sort</a></li>
+ @endif
+ @if(userCan('restrictions-manage', $book))
+ <li><a href="{{$book->getUrl()}}/restrict" class="text-primary"><i class="zmdi zmdi-lock-outline"></i>Restrict</a></li>
+ @endif
+ @if(userCan('book-delete', $book))
+ <li><a href="{{ $book->getUrl() }}/delete" class="text-neg"><i class="zmdi zmdi-delete"></i>Delete</a></li>
+ @endif
+ </ul>
+ </div>
@endif
</div>
</div>
<div class="col-md-4 col-md-offset-1">
<div class="margin-top large"></div>
+ @if($book->restricted)
+ <p class="text-muted">
+ @if(userCan('restrictions-manage', $book))
+ <a href="{{ $book->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Book Restricted</a>
+ @else
+ <i class="zmdi zmdi-lock-outline"></i>Book Restricted
+ @endif
+ </p>
+ @endif
<div class="search-box">
<form ng-submit="searchBook($event)">
<input ng-model="searchTerm" ng-change="checkSearchForm()" type="text" name="term" placeholder="Search This Book">
--- /dev/null
+@extends('base')
+
+@section('content')
+
+ <div class="faded-small toolbar">
+ <div class="container">
+ <div class="row">
+ <div class="col-sm-12 faded">
+ <div class="breadcrumbs">
+ <a href="{{$chapter->book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $chapter->book->getShortName() }}</a>
+ <span class="sep">»</span>
+ <a href="{{ $chapter->getUrl() }}" class="text-chapter text-button"><i class="zmdi zmdi-collection-bookmark"></i>{{$chapter->getShortName()}}</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="container" ng-non-bindable>
+ <h1>Chapter Restrictions</h1>
+ @include('form/restriction-form', ['model' => $chapter])
+ </div>
+
+@stop
</div>
<div class="col-md-8 faded">
<div class="action-buttons">
- @if($currentUser->can('chapter-create'))
+ @if(userCan('page-create', $chapter))
<a href="{{$chapter->getUrl() . '/create-page'}}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>New Page</a>
@endif
- @if($currentUser->can('chapter-update'))
+ @if(userCan('chapter-update', $chapter))
<a href="{{$chapter->getUrl() . '/edit'}}" class="text-primary text-button"><i class="zmdi zmdi-edit"></i>Edit</a>
@endif
- @if($currentUser->can('chapter-delete'))
+ @if(userCan('restrictions-manage', $chapter))
+ <a href="{{$chapter->getUrl()}}/restrict" class="text-primary text-button"><i class="zmdi zmdi-lock-outline"></i>Restrict</a>
+ @endif
+ @if(userCan('chapter-delete', $chapter))
<a href="{{$chapter->getUrl() . '/delete'}}" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete</a>
@endif
</div>
<h1>{{ $chapter->name }}</h1>
<p class="text-muted">{{ $chapter->description }}</p>
- @if(count($chapter->pages) > 0)
+ @if(count($pages) > 0)
<div class="page-list">
<hr>
- @foreach($chapter->pages as $page)
+ @foreach($pages as $page)
@include('pages/list-item', ['page' => $page])
<hr>
@endforeach
</p>
</div>
<div class="col-md-3 col-md-offset-1">
+ <div class="margin-top large"></div>
+ @if($book->restricted || $chapter->restricted)
+ <div class="text-muted">
+
+ @if($book->restricted)
+ @if(userCan('restrictions-manage', $book))
+ <a href="{{ $book->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Book Restricted</a>
+ @else
+ <i class="zmdi zmdi-lock-outline"></i>Book Restricted
+ @endif
+ <br>
+ @endif
+
+ @if($chapter->restricted)
+ @if(userCan('restrictions-manage', $chapter))
+ <a href="{{ $chapter->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Chapter Restricted</a>
+ @else
+ <i class="zmdi zmdi-lock-outline"></i>Chapter Restricted
+ @endif
+ @endif
+ </div>
+ @endif
+
@include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree])
</div>
</div>
<div class="container">
- <h1 class="text-muted">Page Not Found</h1>
+ <h1 class="text-muted">{{ $message or 'Page Not Found' }}</h1>
<p>Sorry, The page you were looking for could not be found.</p>
<a href="/" class="button">Return To Home</a>
</div>
--- /dev/null
+
+<label>
+ <input value="true" id="{{$name}}" type="checkbox" name="{{$name}}"
+ @if($errors->has($name)) class="neg" @endif
+ @if(old($name) || (!old() && isset($model) && $model->$name)) checked="checked" @endif
+ >
+ {{ $label }}
+</label>
+
+@if($errors->has($name))
+ <div class="text-neg text-small">{{ $errors->first($name) }}</div>
+@endif
\ No newline at end of file
--- /dev/null
+
+<label>
+ <input value="true" id="{{$name}}[{{$role->id}}][{{$action}}]" type="checkbox" name="{{$name}}[{{$role->id}}][{{$action}}]"
+ @if(old($name .'.'.$role->id.'.'.$action) || (!old() && isset($model) && $model->hasRestriction($role->id, $action))) checked="checked" @endif
+ >
+ {{ $label }}
+</label>
\ No newline at end of file
--- /dev/null
+<form action="{{ $model->getUrl() }}/restrict" method="POST">
+ {!! csrf_field() !!}
+ <input type="hidden" name="_method" value="PUT">
+
+ <div class="form-group">
+ @include('form/checkbox', ['name' => 'restricted', 'label' => 'Restrict this ' . $model->getClassName()])
+ </div>
+
+ <table class="table">
+ <tr>
+ <th>Role</th>
+ <th @if($model->isA('page')) colspan="3" @else colspan="4" @endif>Actions</th>
+ </tr>
+ @foreach($roles as $role)
+ <tr>
+ <td>{{ $role->display_name }}</td>
+ <td>@include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => 'View', 'action' => 'view'])</td>
+ @if(!$model->isA('page'))
+ <td>@include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => 'Create', 'action' => 'create'])</td>
+ @endif
+ <td>@include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => 'Update', 'action' => 'update'])</td>
+ <td>@include('form/restriction-checkbox', ['name'=>'restrictions', 'label' => 'Delete', 'action' => 'delete'])</td>
+ </tr>
+ @endforeach
+ </table>
+
+ <a href="{{ $model->getUrl() }}" class="button muted">Cancel</a>
+ <button type="submit" class="button pos">Save Restrictions</button>
+</form>
\ No newline at end of file
--- /dev/null
+
+@foreach($roles as $role)
+ <label>
+ <input value="{{ $role->id }}" id="{{$name}}-{{$role->name}}" type="checkbox" name="{{$name}}[{{$role->name}}]"
+ @if($errors->has($name)) class="neg" @endif
+ @if(old($name . '.' . $role->name) || (!old('name') && isset($model) && $model->hasRole($role->name))) checked="checked" @endif
+ >
+ {{ $role->display_name }}
+ </label>
+@endforeach
+
+@if($errors->has($name))
+ <div class="text-neg text-small">{{ $errors->first($name) }}</div>
+@endif
\ No newline at end of file
<div class="col-sm-4">
<h3><a class="no-color" href="/pages/recently-created">Recently Created Pages</a></h3>
- @include('partials/entity-list', ['entities' => $recentlyCreatedPages, 'style' => 'compact'])
+ <div id="recently-created-pages">
+ @include('partials/entity-list', ['entities' => $recentlyCreatedPages, 'style' => 'compact'])
+ </div>
<h3><a class="no-color" href="/pages/recently-updated">Recently Updated Pages</a></h3>
- @include('partials/entity-list', ['entities' => $recentlyCreatedPages, 'style' => 'compact'])
+ <div id="recently-updated-pages">
+ @include('partials/entity-list', ['entities' => $recentlyUpdatedPages, 'style' => 'compact'])
+ </div>
</div>
<div class="col-sm-4" id="recent-activity">
--- /dev/null
+@extends('base')
+
+@section('content')
+
+ <div class="faded-small toolbar">
+ <div class="container">
+ <div class="row">
+ <div class="col-sm-12 faded">
+ <div class="breadcrumbs">
+ <a href="{{$page->book->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-book"></i>{{ $page->book->getShortName() }}</a>
+ @if($page->hasChapter())
+ <span class="sep">»</span>
+ <a href="{{ $page->chapter->getUrl() }}" class="text-chapter text-button">
+ <i class="zmdi zmdi-collection-bookmark"></i>
+ {{$page->chapter->getShortName()}}
+ </a>
+ @endif
+ <span class="sep">»</span>
+ <a href="{{$page->getUrl()}}" class="text-book text-button"><i class="zmdi zmdi-file"></i>{{ $page->getShortName() }}</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="container" ng-non-bindable>
+ <h1>Page Restrictions</h1>
+ @include('form/restriction-form', ['model' => $page])
+ </div>
+
+@stop
<span dropdown class="dropdown-container">
<div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div>
<ul class="wide">
- <li><a href="{{$page->getUrl() . '/export/html'}}" target="_blank">Contained Web File <span class="text-muted float right">.html</span></a></li>
- <li><a href="{{$page->getUrl() . '/export/pdf'}}" target="_blank">PDF File <span class="text-muted float right">.pdf</span></a></li>
- <li><a href="{{$page->getUrl() . '/export/plaintext'}}" target="_blank">Plain Text File <span class="text-muted float right">.txt</span></a></li>
+ <li><a href="{{$page->getUrl()}}/export/html" target="_blank">Contained Web File <span class="text-muted float right">.html</span></a></li>
+ <li><a href="{{$page->getUrl()}}/export/pdf" target="_blank">PDF File <span class="text-muted float right">.pdf</span></a></li>
+ <li><a href="{{$page->getUrl()}}/export/plaintext" target="_blank">Plain Text File <span class="text-muted float right">.txt</span></a></li>
</ul>
</span>
- @if($currentUser->can('page-update'))
- <a href="{{$page->getUrl() . '/revisions'}}" class="text-primary text-button"><i class="zmdi zmdi-replay"></i>Revisions</a>
- <a href="{{$page->getUrl() . '/edit'}}" class="text-primary text-button" ><i class="zmdi zmdi-edit"></i>Edit</a>
+ @if(userCan('page-update', $page))
+ <a href="{{$page->getUrl()}}/revisions" class="text-primary text-button"><i class="zmdi zmdi-replay"></i>Revisions</a>
+ <a href="{{$page->getUrl()}}/edit" class="text-primary text-button" ><i class="zmdi zmdi-edit"></i>Edit</a>
@endif
- @if($currentUser->can('page-delete'))
- <a href="{{$page->getUrl() . '/delete'}}" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete</a>
+ @if(userCan('restrictions-manage', $page))
+ <a href="{{$page->getUrl()}}/restrict" class="text-primary text-button"><i class="zmdi zmdi-lock-outline"></i>Restrict</a>
+ @endif
+ @if(userCan('page-delete', $page))
+ <a href="{{$page->getUrl()}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete</a>
@endif
</div>
</div>
</div>
</div>
<div class="col-md-3 print-hidden">
+ <div class="margin-top large"></div>
+ @if($book->restricted || ($page->chapter && $page->chapter->restricted) || $page->restricted)
+ <div class="text-muted">
+
+ @if($book->restricted)
+ @if(userCan('restrictions-manage', $book))
+ <a href="{{ $book->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Book restricted</a>
+ @else
+ <i class="zmdi zmdi-lock-outline"></i>Book restricted
+ @endif
+ <br>
+ @endif
+ @if($page->chapter && $page->chapter->restricted)
+ @if(userCan('restrictions-manage', $page->chapter))
+ <a href="{{ $page->chapter->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Chapter restricted</a>
+ @else
+ <i class="zmdi zmdi-lock-outline"></i>Chapter restricted
+ @endif
+ <br>
+ @endif
+
+ @if($page->restricted)
+ @if(userCan('restrictions-manage', $page))
+ <a href="{{ $page->getUrl() }}/restrict"><i class="zmdi zmdi-lock-outline"></i>Page restricted</a>
+ @else
+ <i class="zmdi zmdi-lock-outline"></i>Page restricted
+ @endif
+ <br>
+ @endif
+ </div>
+ @endif
@include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree])
</div>
{{ $activity->getText() }}
- @if($activity->entity())
- <a href="{{ $activity->entity()->getUrl() }}">{{ $activity->entity()->name }}</a>
+ @if($activity->entity)
+ <a href="{{ $activity->entity->getUrl() }}">{{ $activity->entity->name }}</a>
@endif
@if($activity->extra) "{{$activity->extra}}" @endif
--- /dev/null
+@if(Setting::get('app-color'))
+ <style>
+ header, #back-to-top {
+ background-color: {{ Setting::get('app-color') }};
+ }
+ .faded-small {
+ background-color: {{ Setting::get('app-color-light') }};
+ }
+ .button-base, .button, input[type="button"], input[type="submit"] {
+ background-color: {{ Setting::get('app-color') }};
+ }
+ .button-base:hover, .button:hover, input[type="button"]:hover, input[type="submit"]:hover, .button:focus {
+ background-color: {{ Setting::get('app-color') }};
+ }
+ .setting-nav a.selected {
+ border-bottom-color: {{ Setting::get('app-color') }};
+ }
+ p.primary:hover, p .primary:hover, span.primary:hover, .text-primary:hover, a, a:hover, a:focus {
+ color: {{ Setting::get('app-color') }};
+ }
+ </style>
+@endif
\ No newline at end of file
<!-- Scripts -->
<script src="/libs/jquery/jquery.min.js?version=2.1.4"></script>
-
+ @include('partials/custom-styles')
</head>
<body class="@yield('body-class')" ng-app="bookStack">
<p class="small">This image should be 43px in height. <br>Large images will be scaled down.</p>
<image-picker resize-height="43" show-remove="true" resize-width="200" current-image="{{ Setting::get('app-logo', '') }}" default-image="/logo.png" name="setting-app-logo" image-class="logo-image"></image-picker>
</div>
+ <div class="form-group" id="color-control">
+ <label for="setting-app-color">Application Primary Color</label>
+ <p class="small">This should be a hex value. <br> Leave empty to reset to the default color.</p>
+ <input type="text" value="{{ Setting::get('app-color', '') }}" name="setting-app-color" id="setting-app-color" placeholder="#0288D1">
+ <input type="hidden" value="{{ Setting::get('app-color-light', '') }}" name="setting-app-color-light" id="setting-app-color-light" placeholder="rgba(21, 101, 192, 0.15)">
+ </div>
</div>
</div>
<select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
@foreach(\BookStack\Role::all() as $role)
<option value="{{$role->id}}"
- @if(\Setting::get('registration-role', \BookStack\Role::getDefault()->id) == $role->id) selected @endif
+ @if(\Setting::get('registration-role', \BookStack\Role::first()->id) == $role->id) selected @endif
>
{{ $role->display_name }}
</option>
@include('partials/image-manager', ['imageType' => 'system'])
@stop
+
+@section('scripts')
+ <script src="/libs/jq-color-picker/tiny-color-picker.min.js?version=1.0.0"></script>
+ <script type="text/javascript">
+ $('#setting-app-color').colorPicker({
+ opacity: false,
+ renderCallback: function($elm, toggled) {
+ var hexVal = '#' + this.color.colors.HEX;
+ var rgb = this.color.colors.RND.rgb;
+ var rgbLightVal = 'rgba('+ [rgb.r, rgb.g, rgb.b, '0.15'].join(',') +')';
+ // Set textbox color to hex color code.
+ var isEmpty = $.trim($elm.val()).length === 0;
+ if (!isEmpty) $elm.val(hexVal);
+ $('#setting-app-color-light').val(isEmpty ? '' : rgbLightVal);
+ // Set page elements to provide preview
+ $('#header, .image-picker .button').css('background-color', hexVal);
+ $('.faded-small').css('background-color', rgbLightVal);
+ $('.setting-nav a.selected').css('border-bottom-color', hexVal);
+ }
+ });
+ </script>
+@stop
\ No newline at end of file
<div class="col-md-12 setting-nav">
<a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
<a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
+ <a href="/settings/roles" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>Roles</a>
</div>
</div>
</div>
--- /dev/null
+<input type="checkbox" name="permissions[{{ $permission }}]"
+ @if(old('permissions.'.$permission, false)|| (!old('display_name', false) && (isset($role) && $role->hasPermission($permission)))) checked="checked" @endif
+ value="true">
\ No newline at end of file
--- /dev/null
+@extends('base')
+
+@section('content')
+
+ @include('settings/navbar', ['selected' => 'roles'])
+
+ <div class="container">
+ <h1>Create New Role</h1>
+
+ <form action="/settings/roles/new" method="POST">
+ @include('settings/roles/form')
+ </form>
+ </div>
+
+@stop
--- /dev/null
+@extends('base')
+
+@section('content')
+
+ @include('settings/navbar', ['selected' => 'roles'])
+
+ <div class="container small" ng-non-bindable>
+ <h1>Delete Role</h1>
+ <p>This will delete the role with the name '{{$role->display_name}}'.</p>
+
+ <form action="/settings/roles/delete/{{$role->id}}" method="POST">
+ {!! csrf_field() !!}
+ <input type="hidden" name="_method" value="DELETE">
+
+ @if($role->users->count() > 0)
+ <div class="form-group">
+ <p>This role has {{$role->users->count()}} users assigned to it. If you would like to migrate the users from this role select a new role below.</p>
+ @include('form/role-select', ['options' => $roles, 'name' => 'migration_role_id'])
+ </div>
+ @endif
+
+ <p class="text-neg">Are you sure you want to delete this role?</p>
+ <a href="/settings/roles/{{ $role->id }}" class="button">Cancel</a>
+ <button type="submit" class="button neg">Confirm</button>
+ </form>
+ </div>
+
+@stop
--- /dev/null
+@extends('base')
+
+@section('content')
+
+ @include('settings/navbar', ['selected' => 'roles'])
+
+ <div class="container">
+ <div class="row">
+ <div class="col-sm-6">
+ <h1>Edit Role <small> {{ $role->display_name }}</small></h1>
+ </div>
+ <div class="col-sm-6">
+ <p></p>
+ <a href="/settings/roles/delete/{{ $role->id }}" class="button neg float right">Delete Role</a>
+ </div>
+ </div>
+
+ <form action="/settings/roles/{{ $role->id }}" method="POST">
+ <input type="hidden" name="_method" value="PUT">
+ @include('settings/roles/form', ['model' => $role])
+ </form>
+ </div>
+
+@stop
--- /dev/null
+{!! csrf_field() !!}
+
+<div class="row">
+
+ <div class="col-md-6">
+ <h3>Role Details</h3>
+ <div class="form-group">
+ <label for="name">Role Name</label>
+ @include('form/text', ['name' => 'display_name'])
+ </div>
+ <div class="form-group">
+ <label for="name">Short Role Description</label>
+ @include('form/text', ['name' => 'description'])
+ </div>
+ <h3>System Permissions</h3>
+ <div class="row">
+ <div class="col-md-6">
+ <label> @include('settings/roles/checkbox', ['permission' => 'users-manage']) Manage users</label>
+ </div>
+ <div class="col-md-6">
+ <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) Manage user roles</label>
+ </div>
+ </div>
+ <hr class="even">
+ <div class="row">
+ <div class="col-md-6">
+ <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) Manage all restrictions</label>
+ </div>
+ <div class="col-md-6">
+ <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-own']) Manage restrictions on own content</label>
+ </div>
+ </div>
+ <hr class="even">
+ <div class="form-group">
+ <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) Manage app settings</label>
+ </div>
+ <hr class="even">
+
+ </div>
+
+ <div class="col-md-6">
+
+ <h3>Asset Permissions</h3>
+ <p>
+ These permissions control default access to the assets within the system. <br>
+ Restrictions on Books, Chapters and Pages will override these permissions.
+ </p>
+ <table class="table">
+ <tr>
+ <th></th>
+ <th>Create</th>
+ <th>Edit</th>
+ <th>Delete</th>
+ </tr>
+ <tr>
+ <td>Books</td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'book-create-all']) All</label>
+ </td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'book-update-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'book-update-all']) All</label>
+ </td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'book-delete-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'book-delete-all']) All</label>
+ </td>
+ </tr>
+ <tr>
+ <td>Chapters</td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-all']) All</label>
+ </td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-all']) All</label>
+ </td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'chapter-delete-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'chapter-delete-all']) All</label>
+ </td>
+ </tr>
+ <tr>
+ <td>Pages</td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'page-create-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'page-create-all']) All</label>
+ </td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'page-update-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'page-update-all']) All</label>
+ </td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'page-delete-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'page-delete-all']) All</label>
+ </td>
+ </tr>
+ <tr>
+ <td>Images</td>
+ <td>@include('settings/roles/checkbox', ['permission' => 'image-create-all'])</td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'image-update-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'image-update-all']) All</label>
+ </td>
+ <td>
+ <label>@include('settings/roles/checkbox', ['permission' => 'image-delete-own']) Own</label>
+ <label>@include('settings/roles/checkbox', ['permission' => 'image-delete-all']) All</label>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+</div>
+
+<a href="/settings/roles" class="button muted">Cancel</a>
+<button type="submit" class="button pos">Save Role</button>
\ No newline at end of file
--- /dev/null
+@extends('base')
+
+@section('content')
+
+ @include('settings/navbar', ['selected' => 'roles'])
+
+ <div class="container small">
+
+ <h1>User Roles</h1>
+
+ <p>
+ <a href="/settings/roles/new" class="text-pos"><i class="zmdi zmdi-lock-open"></i>Add new role</a>
+ </p>
+
+ <table class="table">
+ <tr>
+ <th>Role Name</th>
+ <th></th>
+ <th class="text-right">Users</th>
+ </tr>
+ @foreach($roles as $role)
+ <tr>
+ <td><a href="/settings/roles/{{ $role->id }}">{{ $role->display_name }}</a></td>
+ <td>{{ $role->description }}</td>
+ <td class="text-right">{{ $role->users->count() }}</td>
+ </tr>
+ @endforeach
+ </table>
+ </div>
+
+@stop
@include('form.text', ['name' => 'name'])
</div>
-@if($currentUser->can('user-update'))
+@if(userCan('users-manage'))
<div class="form-group">
<label for="email">Email</label>
@include('form.text', ['name' => 'email'])
</div>
@endif
-@if($currentUser->can('user-update'))
+@if(userCan('users-manage'))
<div class="form-group">
<label for="role">User Role</label>
- @include('form.role-select', ['name' => 'role', 'options' => \BookStack\Role::all(), 'displayKey' => 'display_name'])
+ @include('form/role-checkboxes', ['name' => 'roles', 'roles' => \BookStack\Role::all()])
</div>
@endif
-@if($currentUser->can('user-update'))
+@if(userCan('users-manage'))
<div class="form-group">
<label for="external_auth_id">External Authentication ID</label>
@include('form.text', ['name' => 'external_auth_id'])
@include('form.text', ['name' => 'email'])
</div>
-@if($currentUser->can('user-update'))
+@if(userCan('users-manage'))
<div class="form-group">
<label for="role">User Role</label>
- @include('form.role-select', ['name' => 'role', 'options' => \BookStack\Role::all(), 'displayKey' => 'display_name'])
+ @include('form/role-checkboxes', ['name' => 'roles', 'roles' => \BookStack\Role::all()])
</div>
@endif
<div class="container small" ng-non-bindable>
<h1>Users</h1>
- @if($currentUser->can('user-create'))
+ @if(userCan('users-manage'))
<p>
<a href="/settings/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add new user</a>
</p>
<th></th>
<th>Name</th>
<th>Email</th>
- <th>User Type</th>
+ <th>User Roles</th>
</tr>
@foreach($users as $user)
<tr>
<td style="line-height: 0;"><img class="avatar med" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
<td>
- @if($currentUser->can('user-update') || $currentUser->id == $user->id)
+ @if(userCan('users-manage') || $currentUser->id == $user->id)
<a href="/settings/users/{{$user->id}}">
@endif
{{ $user->name }}
- @if($currentUser->can('user-update') || $currentUser->id == $user->id)
+ @if(userCan('users-manage') || $currentUser->id == $user->id)
</a>
@endif
</td>
<td>
- @if($currentUser->can('user-update') || $currentUser->id == $user->id)
+ @if(userCan('users-manage') || $currentUser->id == $user->id)
<a href="/settings/users/{{$user->id}}">
@endif
{{ $user->email }}
- @if($currentUser->can('user-update') || $currentUser->id == $user->id)
+ @if(userCan('users-manage') || $currentUser->id == $user->id)
</a>
@endif
</td>
- <td>{{ $user->role->display_name }}</td>
+ <td>
+ <small> {{ $user->roles->implode('display_name', ', ') }}</small>
+ </td>
</tr>
@endforeach
</table>
->click('Add new user')
->type($user->name, '#name')
->type($user->email, '#email')
- ->select(2, '#role')
+ ->check('roles[admin]')
->type($user->password, '#password')
->type($user->password, '#password-confirm')
->press('Save')
- ->seeInDatabase('users', $user->toArray())
->seePageIs('/settings/users')
+ ->seeInDatabase('users', $user->toArray())
->see($user->name);
}
->seePageIs($newPageUrl);
}
+ public function test_recently_updated_pages_on_home()
+ {
+ $page = \BookStack\Page::orderBy('updated_at', 'asc')->first();
+ $this->asAdmin()->visit('/')
+ ->dontSeeInElement('#recently-updated-pages', $page->name);
+ $this->visit($page->getUrl() . '/edit')
+ ->press('Save Page')
+ ->visit('/')
+ ->seeInElement('#recently-updated-pages', $page->name);
+ }
+
+ public function test_recently_created_pages_on_home()
+ {
+ $entityChain = $this->createEntityChainBelongingToUser($this->getNewUser());
+ $this->asAdmin()->visit('/')
+ ->seeInElement('#recently-created-pages', $entityChain['page']->name);
+ }
+
}
--- /dev/null
+<?php
+
+class RestrictionsTest extends TestCase
+{
+ protected $user;
+
+ public function setUp()
+ {
+ parent::setUp();
+ $this->user = $this->getNewUser();
+ }
+
+ /**
+ * Manually set some restrictions on an entity.
+ * @param \BookStack\Entity $entity
+ * @param $actions
+ */
+ protected function setEntityRestrictions(\BookStack\Entity $entity, $actions)
+ {
+ $entity->restricted = true;
+ $entity->restrictions()->delete();
+ $role = $this->user->roles->first();
+ foreach ($actions as $action) {
+ $entity->restrictions()->create([
+ 'role_id' => $role->id,
+ 'action' => strtolower($action)
+ ]);
+ }
+ $entity->save();
+ $entity->load('restrictions');
+ }
+
+ public function test_book_view_restriction()
+ {
+ $book = \BookStack\Book::first();
+ $bookPage = $book->pages->first();
+ $bookChapter = $book->chapters->first();
+
+ $bookUrl = $book->getUrl();
+ $this->actingAs($this->user)
+ ->visit($bookUrl)
+ ->seePageIs($bookUrl);
+
+ $this->setEntityRestrictions($book, []);
+
+ $this->forceVisit($bookUrl)
+ ->see('Book not found');
+ $this->forceVisit($bookPage->getUrl())
+ ->see('Book not found');
+ $this->forceVisit($bookChapter->getUrl())
+ ->see('Book not found');
+
+ $this->setEntityRestrictions($book, ['view']);
+
+ $this->visit($bookUrl)
+ ->see($book->name);
+ $this->visit($bookPage->getUrl())
+ ->see($bookPage->name);
+ $this->visit($bookChapter->getUrl())
+ ->see($bookChapter->name);
+ }
+
+ public function test_book_create_restriction()
+ {
+ $book = \BookStack\Book::first();
+
+ $bookUrl = $book->getUrl();
+ $this->actingAs($this->user)
+ ->visit($bookUrl)
+ ->seeInElement('.action-buttons', 'New Page')
+ ->seeInElement('.action-buttons', 'New Chapter');
+
+ $this->setEntityRestrictions($book, ['view', 'delete', 'update']);
+
+ $this->forceVisit($bookUrl . '/chapter/create')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->forceVisit($bookUrl . '/page/create')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->visit($bookUrl)->dontSeeInElement('.action-buttons', 'New Page')
+ ->dontSeeInElement('.action-buttons', 'New Chapter');
+
+ $this->setEntityRestrictions($book, ['view', 'create']);
+
+ $this->visit($bookUrl . '/chapter/create')
+ ->type('test chapter', 'name')
+ ->type('test description for chapter', 'description')
+ ->press('Save Chapter')
+ ->seePageIs($bookUrl . '/chapter/test-chapter');
+ $this->visit($bookUrl . '/page/create')
+ ->type('test page', 'name')
+ ->type('test content', 'html')
+ ->press('Save Page')
+ ->seePageIs($bookUrl . '/page/test-page');
+ $this->visit($bookUrl)->seeInElement('.action-buttons', 'New Page')
+ ->seeInElement('.action-buttons', 'New Chapter');
+ }
+
+ public function test_book_update_restriction()
+ {
+ $book = \BookStack\Book::first();
+ $bookPage = $book->pages->first();
+ $bookChapter = $book->chapters->first();
+
+ $bookUrl = $book->getUrl();
+ $this->actingAs($this->user)
+ ->visit($bookUrl . '/edit')
+ ->see('Edit Book');
+
+ $this->setEntityRestrictions($book, ['view', 'delete']);
+
+ $this->forceVisit($bookUrl . '/edit')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->forceVisit($bookPage->getUrl() . '/edit')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->forceVisit($bookChapter->getUrl() . '/edit')
+ ->see('You do not have permission')->seePageIs('/');
+
+ $this->setEntityRestrictions($book, ['view', 'update']);
+
+ $this->visit($bookUrl . '/edit')
+ ->seePageIs($bookUrl . '/edit');
+ $this->visit($bookPage->getUrl() . '/edit')
+ ->seePageIs($bookPage->getUrl() . '/edit');
+ $this->visit($bookChapter->getUrl() . '/edit')
+ ->see('Edit Chapter');
+ }
+
+ public function test_book_delete_restriction()
+ {
+ $book = \BookStack\Book::first();
+ $bookPage = $book->pages->first();
+ $bookChapter = $book->chapters->first();
+
+ $bookUrl = $book->getUrl();
+ $this->actingAs($this->user)
+ ->visit($bookUrl . '/delete')
+ ->see('Delete Book');
+
+ $this->setEntityRestrictions($book, ['view', 'update']);
+
+ $this->forceVisit($bookUrl . '/delete')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->forceVisit($bookPage->getUrl() . '/delete')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->forceVisit($bookChapter->getUrl() . '/delete')
+ ->see('You do not have permission')->seePageIs('/');
+
+ $this->setEntityRestrictions($book, ['view', 'delete']);
+
+ $this->visit($bookUrl . '/delete')
+ ->seePageIs($bookUrl . '/delete')->see('Delete Book');
+ $this->visit($bookPage->getUrl() . '/delete')
+ ->seePageIs($bookPage->getUrl() . '/delete')->see('Delete Page');
+ $this->visit($bookChapter->getUrl() . '/delete')
+ ->see('Delete Chapter');
+ }
+
+ public function test_chapter_view_restriction()
+ {
+ $chapter = \BookStack\Chapter::first();
+ $chapterPage = $chapter->pages->first();
+
+ $chapterUrl = $chapter->getUrl();
+ $this->actingAs($this->user)
+ ->visit($chapterUrl)
+ ->seePageIs($chapterUrl);
+
+ $this->setEntityRestrictions($chapter, []);
+
+ $this->forceVisit($chapterUrl)
+ ->see('Chapter not found');
+ $this->forceVisit($chapterPage->getUrl())
+ ->see('Page not found');
+
+ $this->setEntityRestrictions($chapter, ['view']);
+
+ $this->visit($chapterUrl)
+ ->see($chapter->name);
+ $this->visit($chapterPage->getUrl())
+ ->see($chapterPage->name);
+ }
+
+ public function test_chapter_create_restriction()
+ {
+ $chapter = \BookStack\Chapter::first();
+
+ $chapterUrl = $chapter->getUrl();
+ $this->actingAs($this->user)
+ ->visit($chapterUrl)
+ ->seeInElement('.action-buttons', 'New Page');
+
+ $this->setEntityRestrictions($chapter, ['view', 'delete', 'update']);
+
+ $this->forceVisit($chapterUrl . '/create-page')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->visit($chapterUrl)->dontSeeInElement('.action-buttons', 'New Page');
+
+ $this->setEntityRestrictions($chapter, ['view', 'create']);
+
+
+ $this->visit($chapterUrl . '/create-page')
+ ->type('test page', 'name')
+ ->type('test content', 'html')
+ ->press('Save Page')
+ ->seePageIs($chapter->book->getUrl() . '/page/test-page');
+ $this->visit($chapterUrl)->seeInElement('.action-buttons', 'New Page');
+ }
+
+ public function test_chapter_update_restriction()
+ {
+ $chapter = \BookStack\Chapter::first();
+ $chapterPage = $chapter->pages->first();
+
+ $chapterUrl = $chapter->getUrl();
+ $this->actingAs($this->user)
+ ->visit($chapterUrl . '/edit')
+ ->see('Edit Chapter');
+
+ $this->setEntityRestrictions($chapter, ['view', 'delete']);
+
+ $this->forceVisit($chapterUrl . '/edit')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->forceVisit($chapterPage->getUrl() . '/edit')
+ ->see('You do not have permission')->seePageIs('/');
+
+ $this->setEntityRestrictions($chapter, ['view', 'update']);
+
+ $this->visit($chapterUrl . '/edit')
+ ->seePageIs($chapterUrl . '/edit')->see('Edit Chapter');
+ $this->visit($chapterPage->getUrl() . '/edit')
+ ->seePageIs($chapterPage->getUrl() . '/edit');
+ }
+
+ public function test_chapter_delete_restriction()
+ {
+ $chapter = \BookStack\Chapter::first();
+ $chapterPage = $chapter->pages->first();
+
+ $chapterUrl = $chapter->getUrl();
+ $this->actingAs($this->user)
+ ->visit($chapterUrl . '/delete')
+ ->see('Delete Chapter');
+
+ $this->setEntityRestrictions($chapter, ['view', 'update']);
+
+ $this->forceVisit($chapterUrl . '/delete')
+ ->see('You do not have permission')->seePageIs('/');
+ $this->forceVisit($chapterPage->getUrl() . '/delete')
+ ->see('You do not have permission')->seePageIs('/');
+
+ $this->setEntityRestrictions($chapter, ['view', 'delete']);
+
+ $this->visit($chapterUrl . '/delete')
+ ->seePageIs($chapterUrl . '/delete')->see('Delete Chapter');
+ $this->visit($chapterPage->getUrl() . '/delete')
+ ->seePageIs($chapterPage->getUrl() . '/delete')->see('Delete Page');
+ }
+
+ public function test_page_view_restriction()
+ {
+ $page = \BookStack\Page::first();
+
+ $pageUrl = $page->getUrl();
+ $this->actingAs($this->user)
+ ->visit($pageUrl)
+ ->seePageIs($pageUrl);
+
+ $this->setEntityRestrictions($page, ['update', 'delete']);
+
+ $this->forceVisit($pageUrl)
+ ->see('Page not found');
+
+ $this->setEntityRestrictions($page, ['view']);
+
+ $this->visit($pageUrl)
+ ->see($page->name);
+ }
+
+ public function test_page_update_restriction()
+ {
+ $page = \BookStack\Chapter::first();
+
+ $pageUrl = $page->getUrl();
+ $this->actingAs($this->user)
+ ->visit($pageUrl . '/edit')
+ ->seeInField('name', $page->name);
+
+ $this->setEntityRestrictions($page, ['view', 'delete']);
+
+ $this->forceVisit($pageUrl . '/edit')
+ ->see('You do not have permission')->seePageIs('/');
+
+ $this->setEntityRestrictions($page, ['view', 'update']);
+
+ $this->visit($pageUrl . '/edit')
+ ->seePageIs($pageUrl . '/edit')->seeInField('name', $page->name);
+ }
+
+ public function test_page_delete_restriction()
+ {
+ $page = \BookStack\Page::first();
+
+ $pageUrl = $page->getUrl();
+ $this->actingAs($this->user)
+ ->visit($pageUrl . '/delete')
+ ->see('Delete Page');
+
+ $this->setEntityRestrictions($page, ['view', 'update']);
+
+ $this->forceVisit($pageUrl . '/delete')
+ ->see('You do not have permission')->seePageIs('/');
+
+ $this->setEntityRestrictions($page, ['view', 'delete']);
+
+ $this->visit($pageUrl . '/delete')
+ ->seePageIs($pageUrl . '/delete')->see('Delete Page');
+ }
+
+ public function test_book_restriction_form()
+ {
+ $book = \BookStack\Book::first();
+ $this->asAdmin()->visit($book->getUrl() . '/restrict')
+ ->see('Book Restrictions')
+ ->check('restricted')
+ ->check('restrictions[2][view]')
+ ->press('Save Restrictions')
+ ->seeInDatabase('books', ['id' => $book->id, 'restricted' => true])
+ ->seeInDatabase('restrictions', [
+ 'restrictable_id' => $book->id,
+ 'restrictable_type' => 'BookStack\Book',
+ 'role_id' => '2',
+ 'action' => 'view'
+ ]);
+ }
+
+ public function test_chapter_restriction_form()
+ {
+ $chapter = \BookStack\Chapter::first();
+ $this->asAdmin()->visit($chapter->getUrl() . '/restrict')
+ ->see('Chapter Restrictions')
+ ->check('restricted')
+ ->check('restrictions[2][update]')
+ ->press('Save Restrictions')
+ ->seeInDatabase('chapters', ['id' => $chapter->id, 'restricted' => true])
+ ->seeInDatabase('restrictions', [
+ 'restrictable_id' => $chapter->id,
+ 'restrictable_type' => 'BookStack\Chapter',
+ 'role_id' => '2',
+ 'action' => 'update'
+ ]);
+ }
+
+ public function test_page_restriction_form()
+ {
+ $page = \BookStack\Page::first();
+ $this->asAdmin()->visit($page->getUrl() . '/restrict')
+ ->see('Page Restrictions')
+ ->check('restricted')
+ ->check('restrictions[2][delete]')
+ ->press('Save Restrictions')
+ ->seeInDatabase('pages', ['id' => $page->id, 'restricted' => true])
+ ->seeInDatabase('restrictions', [
+ 'restrictable_id' => $page->id,
+ 'restrictable_type' => 'BookStack\Page',
+ 'role_id' => '2',
+ 'action' => 'delete'
+ ]);
+ }
+
+ public function test_restricted_pages_not_visible_in_book_navigation_on_pages()
+ {
+ $chapter = \BookStack\Chapter::first();
+ $page = $chapter->pages->first();
+ $page2 = $chapter->pages[2];
+
+ $this->setEntityRestrictions($page, []);
+
+ $this->actingAs($this->user)
+ ->visit($page2->getUrl())
+ ->dontSeeInElement('.sidebar-page-list', $page->name);
+ }
+
+ public function test_restricted_pages_not_visible_in_book_navigation_on_chapters()
+ {
+ $chapter = \BookStack\Chapter::first();
+ $page = $chapter->pages->first();
+
+ $this->setEntityRestrictions($page, []);
+
+ $this->actingAs($this->user)
+ ->visit($chapter->getUrl())
+ ->dontSeeInElement('.sidebar-page-list', $page->name);
+ }
+
+ public function test_restricted_pages_not_visible_on_chapter_pages()
+ {
+ $chapter = \BookStack\Chapter::first();
+ $page = $chapter->pages->first();
+
+ $this->setEntityRestrictions($page, []);
+
+ $this->actingAs($this->user)
+ ->visit($chapter->getUrl())
+ ->dontSee($page->name);
+ }
+
+}
--- /dev/null
+<?php
+
+class RolesTest extends TestCase
+{
+ protected $user;
+
+ public function setUp()
+ {
+ parent::setUp();
+ $this->user = $this->getNewBlankUser();
+ }
+
+ /**
+ * Give the given user some permissions.
+ * @param \BookStack\User $user
+ * @param array $permissions
+ */
+ protected function giveUserPermissions(\BookStack\User $user, $permissions = [])
+ {
+ $newRole = $this->createNewRole($permissions);
+ $user->attachRole($newRole);
+ $user->load('roles');
+ $user->permissions(false);
+ }
+
+ /**
+ * Create a new basic role for testing purposes.
+ * @param array $permissions
+ * @return static
+ */
+ protected function createNewRole($permissions = [])
+ {
+ $permissionRepo = app('BookStack\Repos\PermissionsRepo');
+ $roleData = factory(\BookStack\Role::class)->make()->toArray();
+ $roleData['permissions'] = array_flip($permissions);
+ return $permissionRepo->saveNewRole($roleData);
+ }
+
+ public function test_admin_can_see_settings()
+ {
+ $this->asAdmin()->visit('/settings')->see('Settings');
+ }
+
+ public function test_cannot_delete_admin_role()
+ {
+ $adminRole = \BookStack\Role::getRole('admin');
+ $deletePageUrl = '/settings/roles/delete/' . $adminRole->id;
+ $this->asAdmin()->visit($deletePageUrl)
+ ->press('Confirm')
+ ->seePageIs($deletePageUrl)
+ ->see('cannot be deleted');
+ }
+
+ public function test_role_cannot_be_deleted_if_default()
+ {
+ $newRole = $this->createNewRole();
+ $this->setSettings(['registration-role' => $newRole->id]);
+
+ $deletePageUrl = '/settings/roles/delete/' . $newRole->id;
+ $this->asAdmin()->visit($deletePageUrl)
+ ->press('Confirm')
+ ->seePageIs($deletePageUrl)
+ ->see('cannot be deleted');
+ }
+
+ public function test_role_create_update_delete_flow()
+ {
+ $testRoleName = 'Test Role';
+ $testRoleDesc = 'a little test description';
+ $testRoleUpdateName = 'An Super Updated role';
+
+ // Creation
+ $this->asAdmin()->visit('/settings')
+ ->click('Roles')
+ ->seePageIs('/settings/roles')
+ ->click('Add new role')
+ ->type('Test Role', 'display_name')
+ ->type('A little test description', 'description')
+ ->press('Save Role')
+ ->seeInDatabase('roles', ['display_name' => $testRoleName, 'name' => 'test-role', 'description' => $testRoleDesc])
+ ->seePageIs('/settings/roles');
+ // Updating
+ $this->asAdmin()->visit('/settings/roles')
+ ->see($testRoleDesc)
+ ->click($testRoleName)
+ ->type($testRoleUpdateName, '#display_name')
+ ->press('Save Role')
+ ->seeInDatabase('roles', ['display_name' => $testRoleUpdateName, 'name' => 'test-role', 'description' => $testRoleDesc])
+ ->seePageIs('/settings/roles');
+ // Deleting
+ $this->asAdmin()->visit('/settings/roles')
+ ->click($testRoleUpdateName)
+ ->click('Delete Role')
+ ->see($testRoleUpdateName)
+ ->press('Confirm')
+ ->seePageIs('/settings/roles')
+ ->dontSee($testRoleUpdateName);
+ }
+
+ public function test_manage_user_permission()
+ {
+ $this->actingAs($this->user)->visit('/')->visit('/settings/users')
+ ->seePageIs('/');
+ $this->giveUserPermissions($this->user, ['users-manage']);
+ $this->actingAs($this->user)->visit('/')->visit('/settings/users')
+ ->seePageIs('/settings/users');
+ }
+
+ public function test_user_roles_manage_permission()
+ {
+ $this->actingAs($this->user)->visit('/')->visit('/settings/roles')
+ ->seePageIs('/')->visit('/settings/roles/1')->seePageIs('/');
+ $this->giveUserPermissions($this->user, ['user-roles-manage']);
+ $this->actingAs($this->user)->visit('/settings/roles')
+ ->seePageIs('/settings/roles')->click('Admin')
+ ->see('Edit Role');
+ }
+
+ public function test_settings_manage_permission()
+ {
+ $this->actingAs($this->user)->visit('/')->visit('/settings')
+ ->seePageIs('/');
+ $this->giveUserPermissions($this->user, ['settings-manage']);
+ $this->actingAs($this->user)->visit('/')->visit('/settings')
+ ->seePageIs('/settings')->press('Save Settings')->see('Settings Saved');
+ }
+
+ public function test_restrictions_manage_all_permission()
+ {
+ $page = \BookStack\Page::take(1)->get()->first();
+ $this->actingAs($this->user)->visit($page->getUrl())
+ ->dontSee('Restrict')
+ ->visit($page->getUrl() . '/restrict')
+ ->seePageIs('/');
+ $this->giveUserPermissions($this->user, ['restrictions-manage-all']);
+ $this->actingAs($this->user)->visit($page->getUrl())
+ ->see('Restrict')
+ ->click('Restrict')
+ ->see('Page Restrictions')->seePageIs($page->getUrl() . '/restrict');
+ }
+
+ public function test_restrictions_manage_own_permission()
+ {
+ $otherUsersPage = \BookStack\Page::take(1)->get()->first();
+ $content = $this->createEntityChainBelongingToUser($this->user);
+ // Check can't restrict other's content
+ $this->actingAs($this->user)->visit($otherUsersPage->getUrl())
+ ->dontSee('Restrict')
+ ->visit($otherUsersPage->getUrl() . '/restrict')
+ ->seePageIs('/');
+ // Check can't restrict own content
+ $this->actingAs($this->user)->visit($content['page']->getUrl())
+ ->dontSee('Restrict')
+ ->visit($content['page']->getUrl() . '/restrict')
+ ->seePageIs('/');
+
+ $this->giveUserPermissions($this->user, ['restrictions-manage-own']);
+
+ // Check can't restrict other's content
+ $this->actingAs($this->user)->visit($otherUsersPage->getUrl())
+ ->dontSee('Restrict')
+ ->visit($otherUsersPage->getUrl() . '/restrict')
+ ->seePageIs('/');
+ // Check can restrict own content
+ $this->actingAs($this->user)->visit($content['page']->getUrl())
+ ->see('Restrict')
+ ->click('Restrict')
+ ->seePageIs($content['page']->getUrl() . '/restrict');
+ }
+
+ /**
+ * Check a standard entity access permission
+ * @param string $permission
+ * @param array $accessUrls Urls that are only accessible after having the permission
+ * @param array $visibles Check this text, In the buttons toolbar, is only visible with the permission
+ * @param null $callback
+ */
+ private function checkAccessPermission($permission, $accessUrls = [], $visibles = [])
+ {
+ foreach ($accessUrls as $url) {
+ $this->actingAs($this->user)->visit('/')->visit($url)
+ ->seePageIs('/');
+ }
+ foreach ($visibles as $url => $text) {
+ $this->actingAs($this->user)->visit('/')->visit($url)
+ ->dontSeeInElement('.action-buttons',$text);
+ }
+
+ $this->giveUserPermissions($this->user, [$permission]);
+
+ foreach ($accessUrls as $url) {
+ $this->actingAs($this->user)->visit('/')->visit($url)
+ ->seePageIs($url);
+ }
+ foreach ($visibles as $url => $text) {
+ $this->actingAs($this->user)->visit('/')->visit($url)
+ ->see($text);
+ }
+ }
+
+ public function test_books_create_all_permissions()
+ {
+ $this->checkAccessPermission('book-create-all', [
+ '/books/create'
+ ], [
+ '/books' => 'Add new book'
+ ]);
+
+ $this->visit('/books/create')
+ ->type('test book', 'name')
+ ->type('book desc', 'description')
+ ->press('Save Book')
+ ->seePageIs('/books/test-book');
+ }
+
+ public function test_books_edit_own_permission()
+ {
+ $otherBook = \BookStack\Book::take(1)->get()->first();
+ $ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
+ $this->checkAccessPermission('book-update-own', [
+ $ownBook->getUrl() . '/edit'
+ ], [
+ $ownBook->getUrl() => 'Edit'
+ ]);
+
+ $this->visit($otherBook->getUrl())
+ ->dontSeeInElement('.action-buttons', 'Edit')
+ ->visit($otherBook->getUrl() . '/edit')
+ ->seePageIs('/');
+ }
+
+ public function test_books_edit_all_permission()
+ {
+ $otherBook = \BookStack\Book::take(1)->get()->first();
+ $this->checkAccessPermission('book-update-all', [
+ $otherBook->getUrl() . '/edit'
+ ], [
+ $otherBook->getUrl() => 'Edit'
+ ]);
+ }
+
+ public function test_books_delete_own_permission()
+ {
+ $this->giveUserPermissions($this->user, ['book-update-all']);
+ $otherBook = \BookStack\Book::take(1)->get()->first();
+ $ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
+ $this->checkAccessPermission('book-delete-own', [
+ $ownBook->getUrl() . '/delete'
+ ], [
+ $ownBook->getUrl() => 'Delete'
+ ]);
+
+ $this->visit($otherBook->getUrl())
+ ->dontSeeInElement('.action-buttons', 'Delete')
+ ->visit($otherBook->getUrl() . '/delete')
+ ->seePageIs('/');
+ $this->visit($ownBook->getUrl())->visit($ownBook->getUrl() . '/delete')
+ ->press('Confirm')
+ ->seePageIs('/books')
+ ->dontSee($ownBook->name);
+ }
+
+ public function test_books_delete_all_permission()
+ {
+ $this->giveUserPermissions($this->user, ['book-update-all']);
+ $otherBook = \BookStack\Book::take(1)->get()->first();
+ $this->checkAccessPermission('book-delete-all', [
+ $otherBook->getUrl() . '/delete'
+ ], [
+ $otherBook->getUrl() => 'Delete'
+ ]);
+
+ $this->visit($otherBook->getUrl())->visit($otherBook->getUrl() . '/delete')
+ ->press('Confirm')
+ ->seePageIs('/books')
+ ->dontSee($otherBook->name);
+ }
+
+ public function test_chapter_create_own_permissions()
+ {
+ $book = \BookStack\Book::take(1)->get()->first();
+ $ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
+ $baseUrl = $ownBook->getUrl() . '/chapter';
+ $this->checkAccessPermission('chapter-create-own', [
+ $baseUrl . '/create'
+ ], [
+ $ownBook->getUrl() => 'New Chapter'
+ ]);
+
+ $this->visit($baseUrl . '/create')
+ ->type('test chapter', 'name')
+ ->type('chapter desc', 'description')
+ ->press('Save Chapter')
+ ->seePageIs($baseUrl . '/test-chapter');
+
+ $this->visit($book->getUrl())
+ ->dontSeeInElement('.action-buttons', 'New Chapter')
+ ->visit($book->getUrl() . '/chapter/create')
+ ->seePageIs('/');
+ }
+
+ public function test_chapter_create_all_permissions()
+ {
+ $book = \BookStack\Book::take(1)->get()->first();
+ $baseUrl = $book->getUrl() . '/chapter';
+ $this->checkAccessPermission('chapter-create-all', [
+ $baseUrl . '/create'
+ ], [
+ $book->getUrl() => 'New Chapter'
+ ]);
+
+ $this->visit($baseUrl . '/create')
+ ->type('test chapter', 'name')
+ ->type('chapter desc', 'description')
+ ->press('Save Chapter')
+ ->seePageIs($baseUrl . '/test-chapter');
+ }
+
+ public function test_chapter_edit_own_permission()
+ {
+ $otherChapter = \BookStack\Chapter::take(1)->get()->first();
+ $ownChapter = $this->createEntityChainBelongingToUser($this->user)['chapter'];
+ $this->checkAccessPermission('chapter-update-own', [
+ $ownChapter->getUrl() . '/edit'
+ ], [
+ $ownChapter->getUrl() => 'Edit'
+ ]);
+
+ $this->visit($otherChapter->getUrl())
+ ->dontSeeInElement('.action-buttons', 'Edit')
+ ->visit($otherChapter->getUrl() . '/edit')
+ ->seePageIs('/');
+ }
+
+ public function test_chapter_edit_all_permission()
+ {
+ $otherChapter = \BookStack\Chapter::take(1)->get()->first();
+ $this->checkAccessPermission('chapter-update-all', [
+ $otherChapter->getUrl() . '/edit'
+ ], [
+ $otherChapter->getUrl() => 'Edit'
+ ]);
+ }
+
+ public function test_chapter_delete_own_permission()
+ {
+ $this->giveUserPermissions($this->user, ['chapter-update-all']);
+ $otherChapter = \BookStack\Chapter::take(1)->get()->first();
+ $ownChapter = $this->createEntityChainBelongingToUser($this->user)['chapter'];
+ $this->checkAccessPermission('chapter-delete-own', [
+ $ownChapter->getUrl() . '/delete'
+ ], [
+ $ownChapter->getUrl() => 'Delete'
+ ]);
+
+ $bookUrl = $ownChapter->book->getUrl();
+ $this->visit($otherChapter->getUrl())
+ ->dontSeeInElement('.action-buttons', 'Delete')
+ ->visit($otherChapter->getUrl() . '/delete')
+ ->seePageIs('/');
+ $this->visit($ownChapter->getUrl())->visit($ownChapter->getUrl() . '/delete')
+ ->press('Confirm')
+ ->seePageIs($bookUrl)
+ ->dontSeeInElement('.book-content', $ownChapter->name);
+ }
+
+ public function test_chapter_delete_all_permission()
+ {
+ $this->giveUserPermissions($this->user, ['chapter-update-all']);
+ $otherChapter = \BookStack\Chapter::take(1)->get()->first();
+ $this->checkAccessPermission('chapter-delete-all', [
+ $otherChapter->getUrl() . '/delete'
+ ], [
+ $otherChapter->getUrl() => 'Delete'
+ ]);
+
+ $bookUrl = $otherChapter->book->getUrl();
+ $this->visit($otherChapter->getUrl())->visit($otherChapter->getUrl() . '/delete')
+ ->press('Confirm')
+ ->seePageIs($bookUrl)
+ ->dontSeeInElement('.book-content', $otherChapter->name);
+ }
+
+ public function test_page_create_own_permissions()
+ {
+ $book = \BookStack\Book::take(1)->get()->first();
+ $chapter = \BookStack\Chapter::take(1)->get()->first();
+
+ $entities = $this->createEntityChainBelongingToUser($this->user);
+ $ownBook = $entities['book'];
+ $ownChapter = $entities['chapter'];
+
+ $baseUrl = $ownBook->getUrl() . '/page';
+
+ $this->checkAccessPermission('page-create-own', [
+ $baseUrl . '/create',
+ $ownChapter->getUrl() . '/create-page'
+ ], [
+ $ownBook->getUrl() => 'New Page',
+ $ownChapter->getUrl() => 'New Page'
+ ]);
+
+ $this->visit($baseUrl . '/create')
+ ->type('test page', 'name')
+ ->type('page desc', 'html')
+ ->press('Save Page')
+ ->seePageIs($baseUrl . '/test-page');
+
+ $this->visit($book->getUrl())
+ ->dontSeeInElement('.action-buttons', 'New Page')
+ ->visit($book->getUrl() . '/page/create')
+ ->seePageIs('/');
+ $this->visit($chapter->getUrl())
+ ->dontSeeInElement('.action-buttons', 'New Page')
+ ->visit($chapter->getUrl() . '/create-page')
+ ->seePageIs('/');
+ }
+
+ public function test_page_create_all_permissions()
+ {
+ $book = \BookStack\Book::take(1)->get()->first();
+ $chapter = \BookStack\Chapter::take(1)->get()->first();
+ $baseUrl = $book->getUrl() . '/page';
+ $this->checkAccessPermission('page-create-all', [
+ $baseUrl . '/create',
+ $chapter->getUrl() . '/create-page'
+ ], [
+ $book->getUrl() => 'New Page',
+ $chapter->getUrl() => 'New Page'
+ ]);
+
+ $this->visit($baseUrl . '/create')
+ ->type('test page', 'name')
+ ->type('page desc', 'html')
+ ->press('Save Page')
+ ->seePageIs($baseUrl . '/test-page');
+
+ $this->visit($chapter->getUrl() . '/create-page')
+ ->type('new test page', 'name')
+ ->type('page desc', 'html')
+ ->press('Save Page')
+ ->seePageIs($baseUrl . '/new-test-page');
+ }
+
+ public function test_page_edit_own_permission()
+ {
+ $otherPage = \BookStack\Page::take(1)->get()->first();
+ $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
+ $this->checkAccessPermission('page-update-own', [
+ $ownPage->getUrl() . '/edit'
+ ], [
+ $ownPage->getUrl() => 'Edit'
+ ]);
+
+ $this->visit($otherPage->getUrl())
+ ->dontSeeInElement('.action-buttons', 'Edit')
+ ->visit($otherPage->getUrl() . '/edit')
+ ->seePageIs('/');
+ }
+
+ public function test_page_edit_all_permission()
+ {
+ $otherPage = \BookStack\Page::take(1)->get()->first();
+ $this->checkAccessPermission('page-update-all', [
+ $otherPage->getUrl() . '/edit'
+ ], [
+ $otherPage->getUrl() => 'Edit'
+ ]);
+ }
+
+ public function test_page_delete_own_permission()
+ {
+ $this->giveUserPermissions($this->user, ['page-update-all']);
+ $otherPage = \BookStack\Page::take(1)->get()->first();
+ $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
+ $this->checkAccessPermission('page-delete-own', [
+ $ownPage->getUrl() . '/delete'
+ ], [
+ $ownPage->getUrl() => 'Delete'
+ ]);
+
+ $bookUrl = $ownPage->book->getUrl();
+ $this->visit($otherPage->getUrl())
+ ->dontSeeInElement('.action-buttons', 'Delete')
+ ->visit($otherPage->getUrl() . '/delete')
+ ->seePageIs('/');
+ $this->visit($ownPage->getUrl())->visit($ownPage->getUrl() . '/delete')
+ ->press('Confirm')
+ ->seePageIs($bookUrl)
+ ->dontSeeInElement('.book-content', $ownPage->name);
+ }
+
+ public function test_page_delete_all_permission()
+ {
+ $this->giveUserPermissions($this->user, ['page-update-all']);
+ $otherPage = \BookStack\Page::take(1)->get()->first();
+ $this->checkAccessPermission('page-delete-all', [
+ $otherPage->getUrl() . '/delete'
+ ], [
+ $otherPage->getUrl() => 'Delete'
+ ]);
+
+ $bookUrl = $otherPage->book->getUrl();
+ $this->visit($otherPage->getUrl())->visit($otherPage->getUrl() . '/delete')
+ ->press('Confirm')
+ ->seePageIs($bookUrl)
+ ->dontSeeInElement('.book-content', $otherPage->name);
+ }
+
+}
<?php
use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Symfony\Component\DomCrawler\Crawler;
class TestCase extends Illuminate\Foundation\Testing\TestCase
{
public function asAdmin()
{
if($this->admin === null) {
- $this->admin = \BookStack\User::find(1);
+ $adminRole = \BookStack\Role::getRole('admin');
+ $this->admin = $adminRole->users->first();
}
return $this->actingAs($this->admin);
}
protected function getNewUser($attributes = [])
{
$user = factory(\BookStack\User::class)->create($attributes);
- $userRepo = app('BookStack\Repos\UserRepo');
- $userRepo->attachDefaultRole($user);
+ $role = \BookStack\Role::getRole('editor');
+ $user->attachRole($role);;
+ return $user;
+ }
+
+ /**
+ * Quick way to create a new user without any permissions
+ * @param array $attributes
+ * @return mixed
+ */
+ protected function getNewBlankUser($attributes = [])
+ {
+ $user = factory(\BookStack\User::class)->create($attributes);
return $user;
}
return $this;
}
+ /**
+ * Assert that the current page matches a given URI.
+ *
+ * @param string $uri
+ * @return $this
+ */
+ protected function seePageUrlIs($uri)
+ {
+ $this->assertEquals(
+ $uri, $this->currentUri, "Did not land on expected page [{$uri}].\n"
+ );
+
+ return $this;
+ }
+
+ /**
+ * Do a forced visit that does not error out on exception.
+ * @param string $uri
+ * @param array $parameters
+ * @param array $cookies
+ * @param array $files
+ * @return $this
+ */
+ protected function forceVisit($uri, $parameters = [], $cookies = [], $files = [])
+ {
+ $method = 'GET';
+ $uri = $this->prepareUrlForRequest($uri);
+ $this->call($method, $uri, $parameters, $cookies, $files);
+ $this->clearInputs()->followRedirects();
+ $this->currentUri = $this->app->make('request')->fullUrl();
+ $this->crawler = new Crawler($this->response->getContent(), $uri);
+ return $this;
+ }
+
/**
* Click the text within the selected element.
* @param $parentElement
projects / bookstack / commitdiff