From 7178c66cf5fb0e347bcad998d27057721b3d62ff Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 1 Jan 2016 21:46:55 +0000 Subject: [PATCH 01/11] Fix error with database migrate command --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index b1570a1f4..eee4b5a6c 100644 --- a/readme.md +++ b/readme.md @@ -38,7 +38,7 @@ git clone https://github.com/ssddanbrown/BookStack.git --branch release --single 4. Ensure the `storage` & `bootstrap/cache` folders are writable by the web server. 5. In the application root, Run `php artisan key:generate` to generate a unique application key. 6. If not using apache or if `.htaccess` files are disabled you will have to create some URL rewrite rules as shown below. -7. Run `php migrate` to update the database. +7. Run `php artisan migrate` to update the database. 8. Done! You can now login using the default admin details `admin@admin.com` with a password of `password`. It is recommended to change these details directly after first logging in. #### URL Rewrite rules From 9319f99a3d084db2b6ad4df27327bf9e19c6269c Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 2 Jan 2016 15:02:19 +0000 Subject: [PATCH 02/11] Updated readme with installation clarification --- readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.md b/readme.md index eee4b5a6c..4073d171c 100644 --- a/readme.md +++ b/readme.md @@ -23,6 +23,8 @@ BookStack has similar requirements to Laravel. On top of those are some front-en Ensure the requirements are met before installing. +Currently BookStack requires its own domain/subdomain and will not work in a site subdirectory. + This project currently uses the `release` branch of this repository as a stable channel for providing updates. The installation is currently somewhat complicated and will be made simpler in future releases. Some PHP/Laravel experience will currently benefit. From e27a630a094639956d1a539531d722068fd4cde2 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 2 Jan 2016 16:24:09 +0000 Subject: [PATCH 03/11] Updated readme with social & update instructions --- .env.example | 8 +++---- app/Services/SocialAuthService.php | 2 +- readme.md | 37 +++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 91e59f966..00d230bff 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,7 @@ APP_KEY=SomeRandomString DB_HOST=localhost DB_DATABASE=database_database DB_USERNAME=database_username -DB_PASSWORD=database__user_password +DB_PASSWORD=database_user_password # Cache and session CACHE_DRIVER=file @@ -33,8 +33,8 @@ GOOGLE_APP_SECRET=false # URL used for social login redirects, NO TRAILING SLASH APP_URL=http://bookstack.dev -# External services -USE_GRAVATAR=true +# External services such as Gravatar +DISABLE_EXTERNAL_SERVICES=false # Mail settings MAIL_DRIVER=smtp @@ -42,4 +42,4 @@ MAIL_HOST=localhost MAIL_PORT=1025 MAIL_USERNAME=null MAIL_PASSWORD=null -MAIL_ENCRYPTION=null \ No newline at end of file +MAIL_ENCRYPTION=null diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php index c96446ddf..15fd1c6a2 100644 --- a/app/Services/SocialAuthService.php +++ b/app/Services/SocialAuthService.php @@ -129,7 +129,7 @@ class SocialAuthService // When a user is logged in, A social account exists but the users do not match. // Change the user that the social account is assigned to. if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id != $currentUser->id) { - \Session::flash('success', 'This ' . title_case($socialDriver) . ' account is already used buy another user.'); + \Session::flash('success', 'This ' . title_case($socialDriver) . ' account is already used by another user.'); return redirect($currentUser->getEditUrl()); } diff --git a/readme.md b/readme.md index 4073d171c..1a429369b 100644 --- a/readme.md +++ b/readme.md @@ -61,6 +61,41 @@ location / { try_files $uri $uri/ /index.php?$query_string; } ``` +## Updating BookStack + +To update BookStack you can run the following command in the root directory of the application: +``` +git pull origin release && composer install && php artisan migrate +``` +This command will update the repository that was created in the installation, install the PHP dependencies using `composer` then run the database migrations. + +## Social Authentication + +BookStack currently supports login via both Google and Github. Once enabled options for these services will show up in the login, registration and user profile pages. By default these services are disabled. To enable them you will have to create an application on the external services to obtain the require application id's and secrets. Here are instructions to do this for the current supported services: + +### Google + +1. Open the [Google Developers Console](https://console.developers.google.com/). +2. Create a new project (May have to wait a short while for it to be created). +3. Select 'Enable and manage APIs'. +4. Enable the 'Google+ API'. +5. In 'Credentials' choose the 'OAuth consent screen' tab and enter a product name ('BookStack' or your custom set name). +6. Back in the 'Credentials' tab click 'New credentials' > 'OAuth client ID'. +7. Choose an application type of 'Web application' and enter the following urls under 'Authorized redirect URIs', changing `https://example.com` to your own domain where BookStack is hosted: + - `https://example.com/login/service/google/callback` + - `https://example.com/register/service/google/callback` +8. Click 'Create' and your app_id and secret will be displayed. Replace the false value on both the `GOOGLE_APP_ID` & `GOOGLE_APP_SECRET` variables in the '.env' file in the BookStack root directory with your own app_id and secret. +9. Set the 'APP_URL' environment variable to be the same domain as you entered in step 7. So, in this example, it will be `https://example.com`. +10. All done! Users should now be able to link to their social accounts in their account profile pages and also register/login using their Google accounts. + +### Github + +1. While logged in, open up your [GitHub developer applications](https://github.com/settings/developers). +2. Click 'Register new application'. +3. Enter an application name ('BookStack' or your custom set name), A link to your app instance under 'Homepage URL' and an 'Authorization callback URL' of the url that your BookStack instance is hosted on then click 'Register application'. +4. A 'Client ID' and a 'Client Secret' value will be shown. Add these two values to the to the `GITHUB_APP_ID` and `GITHUB_APP_SECRET` variables, replacing the default false value, in the '.env' file found in the BookStack root folder. +5. Set the 'APP_URL' environment variable to be the same domain as you entered in step 3. +6. All done! Users should now be able to link to their social accounts in their account profile pages and also register/login using their Github account. ## Testing @@ -73,7 +108,7 @@ php artisan migrate --database=mysql_testing php artisan db:seed --class=DummyContentSeeder --database=mysql_testing ``` -Once done you can run `phpunit` in the application root directory to run all tests. +Once done you can run `phpunit` (or `./vendor/bin/phpunit` if `phpunit` is not found) in the application root directory to run all tests. ## License From 14ca31768cdc79e06a4ab4c74bb650a37bff4eb5 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 9 Jan 2016 19:23:35 +0000 Subject: [PATCH 04/11] Updated laravel to 5.2 and started ldap implementation --- app/Exceptions/Handler.php | 6 + app/Exceptions/LdapException.php | 9 + app/Http/Controllers/Auth/AuthController.php | 11 +- app/Http/Controllers/Controller.php | 2 +- app/Http/Controllers/UserController.php | 2 +- app/Http/routes.php | 6 + app/Providers/AuthServiceProvider.php | 31 + app/Providers/LdapUserProvider.php | 117 ++ app/Services/ImageService.php | 6 +- app/Services/LdapService.php | 60 + app/Services/SocialAuthService.php | 13 +- composer.json | 6 +- composer.lock | 1019 ++++++++++------- config/app.php | 6 +- config/auth.php | 119 +- config/filesystems.php | 13 +- config/services.php | 10 + .../views/auth/forms/login/ldap.blade.php | 9 + .../views/auth/forms/login/standard.blade.php | 10 + resources/views/auth/login.blade.php | 12 +- 20 files changed, 950 insertions(+), 517 deletions(-) create mode 100644 app/Exceptions/LdapException.php create mode 100644 app/Providers/AuthServiceProvider.php create mode 100644 app/Providers/LdapUserProvider.php create mode 100644 app/Services/LdapService.php create mode 100644 resources/views/auth/forms/login/ldap.blade.php create mode 100644 resources/views/auth/forms/login/standard.blade.php diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 792bdd266..84f38e8f5 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -3,8 +3,11 @@ namespace BookStack\Exceptions; use Exception; +use Illuminate\Contracts\Validation\ValidationException; +use Illuminate\Database\Eloquent\ModelNotFoundException; use Symfony\Component\HttpKernel\Exception\HttpException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Auth\Access\AuthorizationException; class Handler extends ExceptionHandler { @@ -14,7 +17,10 @@ class Handler extends ExceptionHandler * @var array */ protected $dontReport = [ + AuthorizationException::class, HttpException::class, + ModelNotFoundException::class, + ValidationException::class, ]; /** diff --git a/app/Exceptions/LdapException.php b/app/Exceptions/LdapException.php new file mode 100644 index 000000000..acdb24302 --- /dev/null +++ b/app/Exceptions/LdapException.php @@ -0,0 +1,9 @@ +exists('auth.authenticate')) { - return view('auth.authenticate'); - } - $socialDrivers = $this->socialAuthService->getActiveDrivers(); - return view('auth.login', ['socialDrivers' => $socialDrivers]); + $authMethod = 'standard'; // TODO - rewrite to use config. + return view('auth/login', ['socialDrivers' => $socialDrivers, 'authMethod' => $authMethod]); } /** @@ -253,7 +248,7 @@ class AuthController extends Controller } /** - * Redirect to the social site for authentication initended to register. + * Redirect to the social site for authentication intended to register. * @param $socialDriver * @return mixed */ diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index ca022f7ca..ab37a44a1 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -48,7 +48,7 @@ abstract class Controller extends BaseController */ protected function preventAccessForDemoUsers() { - if (env('APP_ENV', 'production') === 'demo') $this->showPermissionError(); + if (config('app.env') === 'demo') $this->showPermissionError(); } /** diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index b81be16f6..9184b245e 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -72,7 +72,7 @@ class UserController extends Controller $user->attachRoleId($request->get('role')); // Get avatar from gravatar and save - if (!env('DISABLE_EXTERNAL_SERVICES', false)) { + if (!config('services.disable_services')) { $avatar = \Images::saveUserGravatar($user); $user->avatar()->associate($avatar); $user->save(); diff --git a/app/Http/routes.php b/app/Http/routes.php index 23d4c33ab..a8eb6b6e4 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -1,5 +1,11 @@ getUserDetails('ssmith'); +}); + // Authenticated routes... Route::group(['middleware' => 'auth'], function () { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php new file mode 100644 index 000000000..40e94b016 --- /dev/null +++ b/app/Providers/AuthServiceProvider.php @@ -0,0 +1,31 @@ +model = $model; + } + + /** + * Create a new instance of the model. + * + * @return \Illuminate\Database\Eloquent\Model + */ + public function createModel() + { + $class = '\\'.ltrim($this->model, '\\'); + + return new $class; + } + + + /** + * Retrieve a user by their unique identifier. + * + * @param mixed $identifier + * @return \Illuminate\Contracts\Auth\Authenticatable|null + */ + public function retrieveById($identifier) + { + return $this->createModel()->newQuery()->find($identifier); + } + + /** + * Retrieve a user by their unique identifier and "remember me" token. + * + * @param mixed $identifier + * @param string $token + * @return \Illuminate\Contracts\Auth\Authenticatable|null + */ + public function retrieveByToken($identifier, $token) + { + $model = $this->createModel(); + + return $model->newQuery() + ->where($model->getAuthIdentifierName(), $identifier) + ->where($model->getRememberTokenName(), $token) + ->first(); + } + + + /** + * Update the "remember me" token for the given user in storage. + * + * @param \Illuminate\Contracts\Auth\Authenticatable $user + * @param string $token + * @return void + */ + public function updateRememberToken(Authenticatable $user, $token) + { + $user->setRememberToken($token); + + $user->save(); + } + + /** + * Retrieve a user by the given credentials. + * + * @param array $credentials + * @return \Illuminate\Contracts\Auth\Authenticatable|null + */ + public function retrieveByCredentials(array $credentials) + { + // TODO: Implement retrieveByCredentials() method. + + // Get user via LDAP + + // Search current user base by looking up a uid + + // If not exists create a new user instance with attached role + // but do not store it in the database yet + + // + } + + /** + * Validate a user against the given credentials. + * + * @param \Illuminate\Contracts\Auth\Authenticatable $user + * @param array $credentials + * @return bool + */ + public function validateCredentials(Authenticatable $user, array $credentials) + { + // TODO: Implement validateCredentials() method. + } +} diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php index 3f3094103..600c85a24 100644 --- a/app/Services/ImageService.php +++ b/app/Services/ImageService.php @@ -200,7 +200,7 @@ class ImageService { if ($this->storageInstance !== null) return $this->storageInstance; - $storageType = env('STORAGE_TYPE'); + $storageType = config('filesystems.default'); $this->storageInstance = $this->fileSystem->disk($storageType); return $this->storageInstance; @@ -226,10 +226,10 @@ class ImageService private function getPublicUrl($filePath) { if ($this->storageUrl === null) { - $storageUrl = env('STORAGE_URL'); + $storageUrl = config('filesystems.url'); // Get the standard public s3 url if s3 is set as storage type - if ($storageUrl == false && env('STORAGE_TYPE') === 's3') { + if ($storageUrl == false && config('filesystems.default') === 's3') { $storageDetails = config('filesystems.disks.s3'); $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket']; } diff --git a/app/Services/LdapService.php b/app/Services/LdapService.php new file mode 100644 index 000000000..a540ab58b --- /dev/null +++ b/app/Services/LdapService.php @@ -0,0 +1,60 @@ + 1 ? $ldapServer[1] : 389); + + if ($ldapConnection === false) { + throw new LdapException('Cannot connect to ldap server, Initial connection failed'); + } + + // Options + + ldap_set_option($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, 3); // TODO - make configurable + + $ldapDn = config('services.ldap.dn'); + $ldapPass = config('services.ldap.pass'); + $isAnonymous = ($ldapDn === false || $ldapPass === false); + if ($isAnonymous) { + $ldapBind = ldap_bind($ldapConnection); + } else { + $ldapBind = ldap_bind($ldapConnection, $ldapDn, $ldapPass); + } + + if (!$ldapBind) throw new LdapException('LDAP access failed using ' . $isAnonymous ? ' anonymous bind.' : ' given dn & pass details'); + + // Find user + $userFilter = $this->buildFilter(config('services.ldap.user_filter'), ['user' => $userName]); + //dd($userFilter); + $baseDn = config('services.ldap.base_dn'); + $ldapSearch = ldap_search($ldapConnection, $baseDn, $userFilter); + $users = ldap_get_entries($ldapConnection, $ldapSearch); + + dd($users); + } + + + private function buildFilter($filterString, $attrs) + { + $newAttrs = []; + foreach ($attrs as $key => $attrText) { + $newKey = '${'.$key.'}'; + $newAttrs[$newKey] = $attrText; + } + return strtr($filterString, $newAttrs); + } + +} \ No newline at end of file diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php index 15fd1c6a2..2437a4827 100644 --- a/app/Services/SocialAuthService.php +++ b/app/Services/SocialAuthService.php @@ -76,9 +76,9 @@ class SocialAuthService throw new UserRegistrationException('This ' . $socialDriver . ' account is already in use, Try logging in via the ' . $socialDriver . ' option.', '/login'); } - if($this->userRepo->getByEmail($socialUser->getEmail())) { + if ($this->userRepo->getByEmail($socialUser->getEmail())) { $email = $socialUser->getEmail(); - throw new UserRegistrationException('The email '. $email.' is already in use. If you already have an account you can connect your ' . $socialDriver .' account from your profile settings.', '/login'); + throw new UserRegistrationException('The email ' . $email . ' is already in use. If you already have an account you can connect your ' . $socialDriver . ' account from your profile settings.', '/login'); } return $socialUser; @@ -172,9 +172,10 @@ class SocialAuthService */ private function checkDriverConfigured($driver) { - $upperName = strtoupper($driver); - $config = [env($upperName . '_APP_ID', false), env($upperName . '_APP_SECRET', false), env('APP_URL', false)]; - return (!in_array(false, $config) && !in_array(null, $config)); + $lowerName = strtolower($driver); + $configPrefix = 'services.' . $lowerName . '.'; + $config = [config($configPrefix . 'client_id'), config($configPrefix . 'client_secret'), config('services.callback_url')]; + return !in_array(false, $config) && !in_array(null, $config); } /** @@ -193,7 +194,7 @@ class SocialAuthService } /** - * @param string $socialDriver + * @param string $socialDriver * @param \Laravel\Socialite\Contracts\User $socialUser * @return SocialAccount */ diff --git a/composer.json b/composer.json index 748ff68f7..0f6cec080 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "type": "project", "require": { "php": ">=5.5.9", - "laravel/framework": "5.1.*", + "laravel/framework": "5.2.*", "intervention/image": "^2.3", "laravel/socialite": "^2.0", "barryvdh/laravel-ide-helper": "^2.1", @@ -17,7 +17,9 @@ "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", "phpunit/phpunit": "~4.0", - "phpspec/phpspec": "~2.1" + "phpspec/phpspec": "~2.1", + "symfony/dom-crawler": "~3.0", + "symfony/css-selector": "~3.0" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 23d2d50b6..364e7092e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "19725116631f01881caafa33052eecb9", - "content-hash": "f1dbd776f0ae13ec99e4e6d99510cd8e", + "hash": "1ca2bc3308d193a556124513e1f57106", + "content-hash": "99d01bead4e1ead29f826cd7eae234ea", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.11.4", + "version": "3.12.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "2524c78e0fa1ed049719b8b6b0696f0b6dfb1ca2" + "reference": "5ee0f33fafe47740c03ff38ddb73ae4f52b4da5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2524c78e0fa1ed049719b8b6b0696f0b6dfb1ca2", - "reference": "2524c78e0fa1ed049719b8b6b0696f0b6dfb1ca2", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5ee0f33fafe47740c03ff38ddb73ae4f52b4da5b", + "reference": "5ee0f33fafe47740c03ff38ddb73ae4f52b4da5b", "shasum": "" }, "require": { @@ -43,6 +43,7 @@ "phpunit/phpunit": "~4.0" }, "suggest": { + "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", "doctrine/cache": "To use the DoctrineCacheAdapter", "ext-curl": "To send requests using cURL", "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages" @@ -83,32 +84,32 @@ "s3", "sdk" ], - "time": "2015-12-04 01:19:53" + "time": "2016-01-06 22:50:48" }, { "name": "barryvdh/laravel-debugbar", - "version": "v2.0.6", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "23672cbbe78278ff1fdb258caa0b1de7b5d0bc0c" + "reference": "974fd16e328ca851a081449100d9509af59cf0ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/23672cbbe78278ff1fdb258caa0b1de7b5d0bc0c", - "reference": "23672cbbe78278ff1fdb258caa0b1de7b5d0bc0c", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/974fd16e328ca851a081449100d9509af59cf0ff", + "reference": "974fd16e328ca851a081449100d9509af59cf0ff", "shasum": "" }, "require": { - "illuminate/support": "~5.0.17|5.1.*", - "maximebf/debugbar": "~1.10.2", + "illuminate/support": "~5.0.17|5.1.*|5.2.*", + "maximebf/debugbar": "~1.11.0", "php": ">=5.4.0", - "symfony/finder": "~2.6" + "symfony/finder": "~2.6|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -137,26 +138,26 @@ "profiler", "webprofiler" ], - "time": "2015-09-09 11:39:27" + "time": "2015-12-22 06:22:38" }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.1.0", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "83999f8467374adcb8893f566c9171c9d9691f50" + "reference": "d82e8f191fb043a0f8cbf2de64fd3027bfa4f772" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/83999f8467374adcb8893f566c9171c9d9691f50", - "reference": "83999f8467374adcb8893f566c9171c9d9691f50", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/d82e8f191fb043a0f8cbf2de64fd3027bfa4f772", + "reference": "d82e8f191fb043a0f8cbf2de64fd3027bfa4f772", "shasum": "" }, "require": { - "illuminate/console": "5.0.x|5.1.x", - "illuminate/filesystem": "5.0.x|5.1.x", - "illuminate/support": "5.0.x|5.1.x", + "illuminate/console": "5.0.x|5.1.x|5.2.x", + "illuminate/filesystem": "5.0.x|5.1.x|5.2.x", + "illuminate/support": "5.0.x|5.1.x|5.2.x", "php": ">=5.4.0", "phpdocumentor/reflection-docblock": "2.0.4", "symfony/class-loader": "~2.3" @@ -200,7 +201,7 @@ "phpstorm", "sublime" ], - "time": "2015-08-13 11:40:00" + "time": "2015-12-21 19:48:06" }, { "name": "classpreloader/classpreloader", @@ -256,62 +257,6 @@ ], "time": "2015-11-09 22:51:51" }, - { - "name": "danielstjules/stringy", - "version": "1.10.0", - "source": { - "type": "git", - "url": "https://github.com/danielstjules/Stringy.git", - "reference": "4749c205db47ee5b32e8d1adf6d9aff8db6caf3b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/danielstjules/Stringy/zipball/4749c205db47ee5b32e8d1adf6d9aff8db6caf3b", - "reference": "4749c205db47ee5b32e8d1adf6d9aff8db6caf3b", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Stringy\\": "src/" - }, - "files": [ - "src/Create.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniel St. Jules", - "email": "danielst.jules@gmail.com", - "homepage": "http://www.danielstjules.com" - } - ], - "description": "A string manipulation library with multibyte support", - "homepage": "https://github.com/danielstjules/Stringy", - "keywords": [ - "UTF", - "helpers", - "manipulation", - "methods", - "multibyte", - "string", - "utf-8", - "utility", - "utils" - ], - "time": "2015-07-23 00:54:12" - }, { "name": "dnoegel/php-xdg-base-dir", "version": "0.1", @@ -414,22 +359,22 @@ }, { "name": "guzzle/guzzle", - "version": "v3.9.3", + "version": "v3.8.1", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba", "shasum": "" }, "require": { "ext-curl": "*", "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" + "symfony/event-dispatcher": ">=2.1" }, "replace": { "guzzle/batch": "self.version", @@ -456,21 +401,18 @@ "guzzle/stream": "self.version" }, "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", + "doctrine/cache": "*", + "monolog/monolog": "1.*", "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + "psr/log": "1.0.*", + "symfony/class-loader": "*", + "zendframework/zend-cache": "<2.3", + "zendframework/zend-log": "<2.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.9-dev" + "dev-master": "3.8-dev" } }, "autoload": { @@ -494,7 +436,7 @@ "homepage": "https://github.com/guzzle/guzzle/contributors" } ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", + "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", "homepage": "http://guzzlephp.org/", "keywords": [ "client", @@ -505,7 +447,7 @@ "rest", "web service" ], - "time": "2015-03-18 18:23:50" + "time": "2014-01-28 22:29:15" }, { "name": "guzzlehttp/guzzle", @@ -680,16 +622,16 @@ }, { "name": "intervention/image", - "version": "2.3.4", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "a67ee32df0c6820cc6e861ad4144ee0ef9c74aa3" + "reference": "9f29360b8ab94585cb9e80cf9045abd5b85feb89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/a67ee32df0c6820cc6e861ad4144ee0ef9c74aa3", - "reference": "a67ee32df0c6820cc6e861ad4144ee0ef9c74aa3", + "url": "https://api.github.com/repos/Intervention/image/zipball/9f29360b8ab94585cb9e80cf9045abd5b85feb89", + "reference": "9f29360b8ab94585cb9e80cf9045abd5b85feb89", "shasum": "" }, "require": { @@ -738,7 +680,7 @@ "thumbnail", "watermark" ], - "time": "2015-11-30 17:03:21" + "time": "2016-01-02 19:15:13" }, { "name": "jakub-onderka/php-console-color", @@ -829,30 +771,30 @@ }, { "name": "jeremeamia/SuperClosure", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "b712f39c671e5ead60c7ebfe662545456aade833" + "reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/b712f39c671e5ead60c7ebfe662545456aade833", - "reference": "b712f39c671e5ead60c7ebfe662545456aade833", + "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/29a88be2a4846d27c1613aed0c9071dfad7b5938", + "reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938", "shasum": "" }, "require": { - "nikic/php-parser": "~1.0", - "php": ">=5.4" + "nikic/php-parser": "^1.2|^2.0", + "php": ">=5.4", + "symfony/polyfill-php56": "^1.0" }, "require-dev": { - "codeclimate/php-test-reporter": "~0.1.2", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -869,7 +811,7 @@ "name": "Jeremy Lindblom", "email": "jeremeamia@gmail.com", "homepage": "https://github.com/jeremeamia", - "role": "developer" + "role": "Developer" } ], "description": "Serialize Closure objects, including their context and binding", @@ -883,49 +825,47 @@ "serialize", "tokenizer" ], - "time": "2015-03-11 20:06:43" + "time": "2015-12-05 17:17:57" }, { "name": "laravel/framework", - "version": "v5.1.25", + "version": "v5.2.7", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "53979acc664debc401bfcb61086c4fc4f196b22d" + "reference": "26cd65eaa4bcc0fb0be381cfb7cfdcda06a3c2b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/53979acc664debc401bfcb61086c4fc4f196b22d", - "reference": "53979acc664debc401bfcb61086c4fc4f196b22d", + "url": "https://api.github.com/repos/laravel/framework/zipball/26cd65eaa4bcc0fb0be381cfb7cfdcda06a3c2b4", + "reference": "26cd65eaa4bcc0fb0be381cfb7cfdcda06a3c2b4", "shasum": "" }, "require": { - "classpreloader/classpreloader": "~2.0|~3.0", - "danielstjules/stringy": "~1.8", + "classpreloader/classpreloader": "~3.0", "doctrine/inflector": "~1.0", "ext-mbstring": "*", "ext-openssl": "*", - "jeremeamia/superclosure": "~2.0", + "jeremeamia/superclosure": "~2.2", "league/flysystem": "~1.0", "monolog/monolog": "~1.11", "mtdowling/cron-expression": "~1.0", - "nesbot/carbon": "~1.19", + "nesbot/carbon": "~1.20", "paragonie/random_compat": "~1.1", "php": ">=5.5.9", "psy/psysh": "0.6.*", "swiftmailer/swiftmailer": "~5.1", - "symfony/console": "2.7.*", - "symfony/css-selector": "2.7.*", - "symfony/debug": "2.7.*", - "symfony/dom-crawler": "2.7.*", - "symfony/finder": "2.7.*", - "symfony/http-foundation": "2.7.*", - "symfony/http-kernel": "2.7.*", - "symfony/process": "2.7.*", - "symfony/routing": "2.7.*", - "symfony/translation": "2.7.*", - "symfony/var-dumper": "2.7.*", - "vlucas/phpdotenv": "~1.0" + "symfony/console": "2.8.*|3.0.*", + "symfony/debug": "2.8.*|3.0.*", + "symfony/finder": "2.8.*|3.0.*", + "symfony/http-foundation": "2.8.*|3.0.*", + "symfony/http-kernel": "2.8.*|3.0.*", + "symfony/polyfill-php56": "~1.0", + "symfony/process": "2.8.*|3.0.*", + "symfony/routing": "2.8.*|3.0.*", + "symfony/translation": "2.8.*|3.0.*", + "symfony/var-dumper": "2.8.*|3.0.*", + "vlucas/phpdotenv": "~2.2" }, "replace": { "illuminate/auth": "self.version", @@ -942,7 +882,6 @@ "illuminate/events": "self.version", "illuminate/exception": "self.version", "illuminate/filesystem": "self.version", - "illuminate/foundation": "self.version", "illuminate/hashing": "self.version", "illuminate/http": "self.version", "illuminate/log": "self.version", @@ -960,28 +899,30 @@ }, "require-dev": { "aws/aws-sdk-php": "~3.0", - "iron-io/iron_mq": "~2.0", "mockery/mockery": "~0.9.2", "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~4.0", - "predis/predis": "~1.0" + "phpunit/phpunit": "~4.1", + "predis/predis": "~1.0", + "symfony/css-selector": "2.8.*|3.0.*", + "symfony/dom-crawler": "2.8.*|3.0.*" }, "suggest": { "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).", "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.3|~6.0).", - "iron-io/iron_mq": "Required to use the iron queue driver (~2.0).", + "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~5.3|~6.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0)." + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", + "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.1-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -1012,7 +953,7 @@ "framework", "laravel" ], - "time": "2015-11-30 19:24:36" + "time": "2016-01-07 13:54:34" }, { "name": "laravel/socialite", @@ -1070,16 +1011,16 @@ }, { "name": "league/flysystem", - "version": "1.0.15", + "version": "1.0.16", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "31525caf9e8772683672fefd8a1ca0c0736020f4" + "reference": "183e1a610664baf6dcd6fceda415baf43cbdc031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/31525caf9e8772683672fefd8a1ca0c0736020f4", - "reference": "31525caf9e8772683672fefd8a1ca0c0736020f4", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/183e1a610664baf6dcd6fceda415baf43cbdc031", + "reference": "183e1a610664baf6dcd6fceda415baf43cbdc031", "shasum": "" }, "require": { @@ -1093,7 +1034,7 @@ "mockery/mockery": "~0.9", "phpspec/phpspec": "^2.2", "phpspec/prophecy-phpunit": "~1.0", - "phpunit/phpunit": "~4.1" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -1150,7 +1091,7 @@ "sftp", "storage" ], - "time": "2015-09-30 22:26:59" + "time": "2015-12-19 20:16:43" }, { "name": "league/flysystem-aws-s3-v3", @@ -1264,25 +1205,25 @@ }, { "name": "maximebf/debugbar", - "version": "v1.10.5", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "30e53e8a28284b69dd223c9f5ee8957befd72636" + "reference": "07741d84d39d10f00551c94284cdefcc69703e77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e53e8a28284b69dd223c9f5ee8957befd72636", - "reference": "30e53e8a28284b69dd223c9f5ee8957befd72636", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/07741d84d39d10f00551c94284cdefcc69703e77", + "reference": "07741d84d39d10f00551c94284cdefcc69703e77", "shasum": "" }, "require": { "php": ">=5.3.0", - "psr/log": "~1.0", - "symfony/var-dumper": "~2.6" + "psr/log": "^1.0", + "symfony/var-dumper": "^2.6|^3.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0|^5.0" }, "suggest": { "kriswallsmith/assetic": "The best way to manage assets", @@ -1292,12 +1233,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-master": "1.11-dev" } }, "autoload": { - "psr-0": { - "DebugBar": "src/" + "psr-4": { + "DebugBar\\": "src/DebugBar/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1309,14 +1250,19 @@ "name": "Maxime Bouroumeau-Fuseau", "email": "maxime.bouroumeau@gmail.com", "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" } ], "description": "Debug bar in the browser for php application", "homepage": "https://github.com/maximebf/php-debugbar", "keywords": [ - "debug" + "debug", + "debugbar" ], - "time": "2015-10-19 20:35:12" + "time": "2015-12-10 09:50:24" }, { "name": "monolog/monolog", @@ -1441,16 +1387,16 @@ }, { "name": "mtdowling/jmespath.php", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "a7d99d0c836e69d27b7bfca1d33ca2759fba3289" + "reference": "192f93e43c2c97acde7694993ab171b3de284093" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a7d99d0c836e69d27b7bfca1d33ca2759fba3289", - "reference": "a7d99d0c836e69d27b7bfca1d33ca2759fba3289", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/192f93e43c2c97acde7694993ab171b3de284093", + "reference": "192f93e43c2c97acde7694993ab171b3de284093", "shasum": "" }, "require": { @@ -1492,7 +1438,7 @@ "json", "jsonpath" ], - "time": "2015-05-27 17:21:31" + "time": "2016-01-05 18:25:05" }, { "name": "nesbot/carbon", @@ -1543,32 +1489,38 @@ }, { "name": "nikic/php-parser", - "version": "v1.4.1", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51" + "reference": "c542e5d86a9775abd1021618eb2430278bfc1e01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51", - "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c542e5d86a9775abd1021618eb2430278bfc1e01", + "reference": "c542e5d86a9775abd1021618eb2430278bfc1e01", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3" + "php": ">=5.4" }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "bin/php-parse" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { - "files": [ - "lib/bootstrap.php" - ] + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1584,20 +1536,20 @@ "parser", "php" ], - "time": "2015-09-19 14:15:08" + "time": "2015-12-04 15:28:43" }, { "name": "paragonie/random_compat", - "version": "1.1.1", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32" + "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a208865a5aeffc2dbbef2a5b3409887272d93f32", - "reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", + "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", "shasum": "" }, "require": { @@ -1632,7 +1584,7 @@ "pseudorandom", "random" ], - "time": "2015-12-01 02:52:15" + "time": "2016-01-06 13:31:20" }, { "name": "phpdocumentor/reflection-docblock", @@ -1897,16 +1849,16 @@ }, { "name": "symfony/class-loader", - "version": "v2.8.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "51f83451bf0ddfc696e47e4642d6cd10fcfce160" + "reference": "ec74b0a279cf3a9bd36172b3e3061591d380ce6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/51f83451bf0ddfc696e47e4642d6cd10fcfce160", - "reference": "51f83451bf0ddfc696e47e4642d6cd10fcfce160", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/ec74b0a279cf3a9bd36172b3e3061591d380ce6c", + "reference": "ec74b0a279cf3a9bd36172b3e3061591d380ce6c", "shasum": "" }, "require": { @@ -1945,29 +1897,30 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2015-11-26 07:00:59" + "time": "2015-12-05 17:37:59" }, { "name": "symfony/console", - "version": "v2.7.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "16bb1cb86df43c90931df65f529e7ebd79636750" + "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/16bb1cb86df43c90931df65f529e7ebd79636750", - "reference": "16bb1cb86df43c90931df65f529e7ebd79636750", + "url": "https://api.github.com/repos/symfony/console/zipball/ebcdc507829df915f4ca23067bd59ee4ef61f6c3", + "reference": "ebcdc507829df915f4ca23067bd59ee4ef61f6c3", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1" + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" }, "suggest": { "psr/log": "For using the console logger", @@ -1977,7 +1930,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2004,90 +1957,37 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-11-18 09:54:26" - }, - { - "name": "symfony/css-selector", - "version": "v2.7.7", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/abb47717fb88aebd9437da2fc8bb01a50a36679f", - "reference": "abb47717fb88aebd9437da2fc8bb01a50a36679f", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com", - "time": "2015-10-30 20:10:21" + "time": "2015-12-22 10:39:06" }, { "name": "symfony/debug", - "version": "v2.7.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa" + "reference": "73612266ac709769effdbfc0762e5b07cfd2ac2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", - "reference": "0dbc119596f4afc82d9b2eb2a7e6a4af1ee763fa", + "url": "https://api.github.com/repos/symfony/debug/zipball/73612266ac709769effdbfc0762e5b07cfd2ac2a", + "reference": "73612266ac709769effdbfc0762e5b07cfd2ac2a", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": ">=5.5.9", "psr/log": "~1.0" }, "conflict": { "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.2", - "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" + "symfony/class-loader": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2114,86 +2014,31 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2015-10-30 20:10:21" - }, - { - "name": "symfony/dom-crawler", - "version": "v2.7.7", - "source": { - "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b33593cbfe1d81b50d48353f338aca76a08658d8", - "reference": "b33593cbfe1d81b50d48353f338aca76a08658d8", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "symfony/css-selector": "~2.3" - }, - "suggest": { - "symfony/css-selector": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony DomCrawler Component", - "homepage": "https://symfony.com", - "time": "2015-11-02 20:20:53" + "time": "2015-12-26 13:39:53" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc" + "reference": "d36355e026905fa5229e1ed7b4e9eda2e67adfcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc", - "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d36355e026905fa5229e1ed7b4e9eda2e67adfcf", + "reference": "d36355e026905fa5229e1ed7b4e9eda2e67adfcf", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" + "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0" }, "suggest": { "symfony/dependency-injection": "", @@ -2202,7 +2047,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2229,29 +2074,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-10-30 20:15:42" + "time": "2015-10-30 23:35:59" }, { "name": "symfony/finder", - "version": "v2.7.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "a06a0c0ff7db3736a50d530c908cca547bf13da9" + "reference": "8617895eb798b6bdb338321ce19453dc113e5675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/a06a0c0ff7db3736a50d530c908cca547bf13da9", - "reference": "a06a0c0ff7db3736a50d530c908cca547bf13da9", + "url": "https://api.github.com/repos/symfony/finder/zipball/8617895eb798b6bdb338321ce19453dc113e5675", + "reference": "8617895eb798b6bdb338321ce19453dc113e5675", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2278,41 +2123,38 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2015-10-30 20:10:21" + "time": "2015-12-05 11:13:14" }, { "name": "symfony/http-foundation", - "version": "v2.7.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e83a3d105ddaf5a113e803c904fdec552d1f1c35" + "reference": "939c8c28a5b1e4ab7317bc30c1f9aa881c4b06b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e83a3d105ddaf5a113e803c904fdec552d1f1c35", - "reference": "e83a3d105ddaf5a113e803c904fdec552d1f1c35", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/939c8c28a5b1e4ab7317bc30c1f9aa881c4b06b5", + "reference": "939c8c28a5b1e4ab7317bc30c1f9aa881c4b06b5", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "require-dev": { - "symfony/expression-language": "~2.4" + "symfony/expression-language": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, - "classmap": [ - "Resources/stubs" - ], "exclude-from-classmap": [ "/Tests/" ] @@ -2333,48 +2175,48 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2015-11-20 17:41:18" + "time": "2015-12-18 15:43:53" }, { "name": "symfony/http-kernel", - "version": "v2.7.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "5570de31e8fbc03777a8c61eb24f9b626e5e5941" + "reference": "f7933e9f19e26e7baba7ec04735b466fedd3a6db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5570de31e8fbc03777a8c61eb24f9b626e5e5941", - "reference": "5570de31e8fbc03777a8c61eb24f9b626e5e5941", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f7933e9f19e26e7baba7ec04735b466fedd3a6db", + "reference": "f7933e9f19e26e7baba7ec04735b466fedd3a6db", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": ">=5.5.9", "psr/log": "~1.0", - "symfony/debug": "~2.6,>=2.6.2", - "symfony/event-dispatcher": "~2.6,>=2.6.7", - "symfony/http-foundation": "~2.5,>=2.5.4" + "symfony/debug": "~2.8|~3.0", + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/http-foundation": "~2.8|~3.0" }, "conflict": { - "symfony/config": "<2.7" + "symfony/config": "<2.8" }, "require-dev": { - "symfony/browser-kit": "~2.3", - "symfony/class-loader": "~2.1", - "symfony/config": "~2.7", - "symfony/console": "~2.3", - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.2", - "symfony/dom-crawler": "~2.0,>=2.0.5", - "symfony/expression-language": "~2.4", - "symfony/finder": "~2.0,>=2.0.5", - "symfony/process": "~2.0,>=2.0.5", - "symfony/routing": "~2.2", - "symfony/stopwatch": "~2.3", - "symfony/templating": "~2.2", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/var-dumper": "~2.6" + "symfony/browser-kit": "~2.8|~3.0", + "symfony/class-loader": "~2.8|~3.0", + "symfony/config": "~2.8|~3.0", + "symfony/console": "~2.8|~3.0", + "symfony/css-selector": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dom-crawler": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/finder": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0", + "symfony/routing": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0", + "symfony/templating": "~2.8|~3.0", + "symfony/translation": "~2.8|~3.0", + "symfony/var-dumper": "~2.8|~3.0" }, "suggest": { "symfony/browser-kit": "", @@ -2388,7 +2230,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2415,29 +2257,196 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2015-11-23 11:57:49" + "time": "2015-12-26 16:46:13" }, { - "name": "symfony/process", - "version": "v2.7.7", + "name": "symfony/polyfill-mbstring", + "version": "v1.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "f6290983c8725d0afa29bdc3e5295879de3e58f5" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/f6290983c8725d0afa29bdc3e5295879de3e58f5", - "reference": "f6290983c8725d0afa29bdc3e5295879de3e58f5", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", + "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-20 09:19:13" + }, + { + "name": "symfony/polyfill-php56", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php56.git", + "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-util": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php56\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2015-12-18 15:10:25" + }, + { + "name": "symfony/polyfill-util", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-util.git", + "reference": "4271c55cbc0a77b2641f861b978123e46b3da969" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969", + "reference": "4271c55cbc0a77b2641f861b978123e46b3da969", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Util\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony utilities for portability of PHP codes", + "homepage": "https://symfony.com", + "keywords": [ + "compat", + "compatibility", + "polyfill", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/process", + "version": "v3.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "f4794f1d00f0746621be3020ffbd8c5e0b217ee3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/f4794f1d00f0746621be3020ffbd8c5e0b217ee3", + "reference": "f4794f1d00f0746621be3020ffbd8c5e0b217ee3", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" } }, "autoload": { @@ -2464,47 +2473,48 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2015-11-19 16:11:24" + "time": "2015-12-23 11:04:02" }, { "name": "symfony/routing", - "version": "v2.7.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "7450f6196711b124fb8b04a12286d01a0401ddfe" + "reference": "3b1bac52f42cb0f54df1a2dbabd55a1d214e2a59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/7450f6196711b124fb8b04a12286d01a0401ddfe", - "reference": "7450f6196711b124fb8b04a12286d01a0401ddfe", + "url": "https://api.github.com/repos/symfony/routing/zipball/3b1bac52f42cb0f54df1a2dbabd55a1d214e2a59", + "reference": "3b1bac52f42cb0f54df1a2dbabd55a1d214e2a59", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "conflict": { - "symfony/config": "<2.7" + "symfony/config": "<2.8" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", - "symfony/config": "~2.7", - "symfony/expression-language": "~2.4", - "symfony/http-foundation": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" + "symfony/config": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/http-foundation": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", "symfony/config": "For using the all-in-one router or any loader", + "symfony/dependency-injection": "For loading routes from a service", "symfony/expression-language": "For using expression matching", "symfony/yaml": "For using the YAML loader" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2537,33 +2547,34 @@ "uri", "url" ], - "time": "2015-11-18 13:41:01" + "time": "2015-12-23 08:00:11" }, { "name": "symfony/translation", - "version": "v2.7.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "e4ecb9c3ba1304eaf24de15c2d7a428101c1982f" + "reference": "dff0867826a7068d673801b7522f8e2634016ef9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e4ecb9c3ba1304eaf24de15c2d7a428101c1982f", - "reference": "e4ecb9c3ba1304eaf24de15c2d7a428101c1982f", + "url": "https://api.github.com/repos/symfony/translation/zipball/dff0867826a7068d673801b7522f8e2634016ef9", + "reference": "dff0867826a7068d673801b7522f8e2634016ef9", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.7" + "symfony/config": "<2.8" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.7", - "symfony/intl": "~2.4", - "symfony/yaml": "~2.2" + "symfony/config": "~2.8|~3.0", + "symfony/intl": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0" }, "suggest": { "psr/log": "To use logging capability in translator", @@ -2573,7 +2584,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2600,24 +2611,28 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2015-11-18 13:41:01" + "time": "2015-12-05 17:45:07" }, { "name": "symfony/var-dumper", - "version": "v2.7.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "72bcb27411780eaee9469729aace73c0d46fb2b8" + "reference": "87db8700deb12ba2b65e858f656a1f885530bcb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/72bcb27411780eaee9469729aace73c0d46fb2b8", - "reference": "72bcb27411780eaee9469729aace73c0d46fb2b8", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/87db8700deb12ba2b65e858f656a1f885530bcb0", + "reference": "87db8700deb12ba2b65e858f656a1f885530bcb0", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "twig/twig": "~1.20|~2.0" }, "suggest": { "ext-symfony_debug": "" @@ -2625,7 +2640,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2659,32 +2674,37 @@ "debug", "dump" ], - "time": "2015-11-18 13:41:01" + "time": "2015-12-05 11:13:14" }, { "name": "vlucas/phpdotenv", - "version": "v1.1.1", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa" + "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa", - "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9caf304153dc2288e4970caec6f1f3b3bc205412", + "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": ">=5.3.9" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.8|^5.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { - "psr-0": { - "Dotenv": "src/" + "psr-4": { + "Dotenv\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2705,7 +2725,7 @@ "env", "environment" ], - "time": "2015-05-30 15:59:26" + "time": "2015-12-29 15:10:30" } ], "packages-dev": [ @@ -2961,16 +2981,16 @@ }, { "name": "phpspec/phpspec", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/phpspec/phpspec.git", - "reference": "1d3938e6d9ffb1bd4805ea8ddac62ea48767f358" + "reference": "5528ce1e93a1efa090c9404aba3395c329b4e6ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/phpspec/zipball/1d3938e6d9ffb1bd4805ea8ddac62ea48767f358", - "reference": "1d3938e6d9ffb1bd4805ea8ddac62ea48767f358", + "url": "https://api.github.com/repos/phpspec/phpspec/zipball/5528ce1e93a1efa090c9404aba3395c329b4e6ed", + "reference": "5528ce1e93a1efa090c9404aba3395c329b4e6ed", "shasum": "" }, "require": { @@ -3035,7 +3055,7 @@ "testing", "tests" ], - "time": "2015-11-29 02:03:49" + "time": "2016-01-01 10:17:54" }, { "name": "phpspec/prophecy", @@ -3339,16 +3359,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.19", + "version": "4.8.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b2caaf8947aba5e002d42126723e9d69795f32b4" + "reference": "ea76b17bced0500a28098626b84eda12dbcf119c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b2caaf8947aba5e002d42126723e9d69795f32b4", - "reference": "b2caaf8947aba5e002d42126723e9d69795f32b4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea76b17bced0500a28098626b84eda12dbcf119c", + "reference": "ea76b17bced0500a28098626b84eda12dbcf119c", "shasum": "" }, "require": { @@ -3407,7 +3427,7 @@ "testing", "xunit" ], - "time": "2015-11-30 08:18:59" + "time": "2015-12-12 07:45:58" }, { "name": "phpunit/phpunit-mock-objects", @@ -3531,28 +3551,28 @@ }, { "name": "sebastian/diff", - "version": "1.3.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -3575,11 +3595,11 @@ } ], "description": "Diff implementation", - "homepage": "http://www.github.com/sebastianbergmann/diff", + "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ "diff" ], - "time": "2015-02-22 15:13:53" + "time": "2015-12-08 07:14:41" }, { "name": "sebastian/environment", @@ -3750,16 +3770,16 @@ }, { "name": "sebastian/recursion-context", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "994d4a811bafe801fb06dccbee797863ba2792ba" + "reference": "913401df809e99e4f47b27cdd781f4a258d58791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba", - "reference": "994d4a811bafe801fb06dccbee797863ba2792ba", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791", "shasum": "" }, "require": { @@ -3799,7 +3819,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-06-21 08:04:50" + "time": "2015-11-11 19:50:13" }, { "name": "sebastian/version", @@ -3837,17 +3857,126 @@ "time": "2015-06-21 13:59:46" }, { - "name": "symfony/yaml", - "version": "v3.0.0", + "name": "symfony/css-selector", + "version": "v3.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002" + "url": "https://github.com/symfony/css-selector.git", + "reference": "4613311fd46e146f506403ce2f8a0c71d402d2a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", - "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/4613311fd46e146f506403ce2f8a0c71d402d2a3", + "reference": "4613311fd46e146f506403ce2f8a0c71d402d2a3", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com", + "time": "2015-12-05 17:45:07" + }, + { + "name": "symfony/dom-crawler", + "version": "v3.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "7c622b0c9fb8bdb146d6dfa86c5f91dcbfdbc11d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7c622b0c9fb8bdb146d6dfa86c5f91dcbfdbc11d", + "reference": "7c622b0c9fb8bdb146d6dfa86c5f91dcbfdbc11d", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "symfony/css-selector": "~2.8|~3.0" + }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "https://symfony.com", + "time": "2015-12-26 13:42:31" + }, + { + "name": "symfony/yaml", + "version": "v3.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691", + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691", "shasum": "" }, "require": { @@ -3883,7 +4012,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-11-30 12:36:17" + "time": "2015-12-26 13:39:53" } ], "aliases": [], diff --git a/config/app.php b/config/app.php index b9c207632..65bafefc6 100644 --- a/config/app.php +++ b/config/app.php @@ -2,6 +2,9 @@ return [ + + 'env' => env('APP_ENV', 'production'), + /* |-------------------------------------------------------------------------- | Application Debug Mode @@ -113,13 +116,11 @@ return [ /* * Laravel Framework Service Providers... */ - Illuminate\Foundation\Providers\ArtisanServiceProvider::class, Illuminate\Auth\AuthServiceProvider::class, Illuminate\Broadcasting\BroadcastServiceProvider::class, Illuminate\Bus\BusServiceProvider::class, Illuminate\Cache\CacheServiceProvider::class, Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, - Illuminate\Routing\ControllerServiceProvider::class, Illuminate\Cookie\CookieServiceProvider::class, Illuminate\Database\DatabaseServiceProvider::class, Illuminate\Encryption\EncryptionServiceProvider::class, @@ -149,6 +150,7 @@ return [ /* * Application Service Providers... */ + BookStack\Providers\AuthServiceProvider::class, BookStack\Providers\AppServiceProvider::class, BookStack\Providers\EventServiceProvider::class, BookStack\Providers\RouteServiceProvider::class, diff --git a/config/auth.php b/config/auth.php index d4f58587d..55d434cdf 100644 --- a/config/auth.php +++ b/config/auth.php @@ -2,66 +2,109 @@ return [ + + 'method' => env('AUTH_METHOD', 'standard'), + /* |-------------------------------------------------------------------------- - | Default Authentication Driver + | Authentication Defaults |-------------------------------------------------------------------------- | - | This option controls the authentication driver that will be utilized. - | This driver manages the retrieval and authentication of the users - | attempting to get access to protected areas of your application. + | This option controls the default authentication "guard" and password + | reset options for your application. You may change these defaults + | as required, but they're a perfect start for most applications. + | + */ + + 'defaults' => [ + 'guard' => 'web', + 'passwords' => 'users', + ], + + /* + |-------------------------------------------------------------------------- + | Authentication Guards + |-------------------------------------------------------------------------- + | + | Next, you may define every authentication guard for your application. + | Of course, a great default configuration has been defined for you + | here which uses session storage and the Eloquent user provider. + | + | All authentication drivers have a user provider. This defines how the + | users are actually retrieved out of your database or other storage + | mechanisms used by this application to persist your user's data. + | + | Supported: "session", "token" + | + */ + + 'guards' => [ + 'web' => [ + 'driver' => 'session', + 'provider' => 'users', + ], + + 'api' => [ + 'driver' => 'token', + 'provider' => 'users', + ], + ], + + /* + |-------------------------------------------------------------------------- + | User Providers + |-------------------------------------------------------------------------- + | + | All authentication drivers have a user provider. This defines how the + | users are actually retrieved out of your database or other storage + | mechanisms used by this application to persist your user's data. + | + | If you have multiple user tables or models you may configure multiple + | sources which represent each model / table. These sources may then + | be assigned to any extra authentication guards you have defined. | | Supported: "database", "eloquent" | */ - 'driver' => 'eloquent', + 'providers' => [ + 'users' => [ + 'driver' => env('AUTH_METHOD', 'eloquent'), + 'model' => Bookstack\User::class, + ], + + // 'users' => [ + // 'driver' => 'database', + // 'table' => 'users', + // ], + ], /* |-------------------------------------------------------------------------- - | Authentication Model - |-------------------------------------------------------------------------- - | - | When using the "Eloquent" authentication driver, we need to know which - | Eloquent model should be used to retrieve your users. Of course, it - | is often just the "User" model but you may use whatever you like. - | - */ - - 'model' => BookStack\User::class, - - /* - |-------------------------------------------------------------------------- - | Authentication Table - |-------------------------------------------------------------------------- - | - | When using the "Database" authentication driver, we need to know which - | table should be used to retrieve your users. We have chosen a basic - | default value but you may easily change it to any table you like. - | - */ - - 'table' => 'users', - - /* - |-------------------------------------------------------------------------- - | Password Reset Settings + | Resetting Passwords |-------------------------------------------------------------------------- | | Here you may set the options for resetting passwords including the view - | that is your password reset e-mail. You can also set the name of the + | that is your password reset e-mail. You may also set the name of the | table that maintains all of the reset tokens for your application. | + | You may specify multiple password reset configurations if you have more + | than one user table or model in the application and you want to have + | separate password reset settings based on the specific user types. + | | The expire time is the number of minutes that the reset token should be | considered valid. This security feature keeps tokens short-lived so | they have less time to be guessed. You may change this as needed. | */ - 'password' => [ - 'email' => 'emails.password', - 'table' => 'password_resets', - 'expire' => 60, + 'passwords' => [ + 'users' => [ + 'provider' => 'users', + 'email' => 'emails.password', + 'table' => 'password_resets', + 'expire' => 60, + ], ], -]; +]; \ No newline at end of file diff --git a/config/filesystems.php b/config/filesystems.php index 5fd3df6df..dbcb03db1 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -15,7 +15,18 @@ return [ | */ - 'default' => 'local', + 'default' => env('STORAGE_TYPE', 'local'), + + /* + |-------------------------------------------------------------------------- + | Storage URL + |-------------------------------------------------------------------------- + | + | This is the url to where the storage is located for when using an external + | file storage service, such as s3, to store publicly accessible assets. + | + */ + 'url' => env('STORAGE_URL', false), /* |-------------------------------------------------------------------------- diff --git a/config/services.php b/config/services.php index 604a8657f..08c2f3217 100644 --- a/config/services.php +++ b/config/services.php @@ -13,6 +13,8 @@ return [ | to have a conventional place to find your various credentials. | */ + 'disable_services' => env('DISABLE_EXTERNAL_SERVICES', false), + 'callback_url' => env('APP_URL', false), 'mailgun' => [ 'domain' => '', @@ -47,4 +49,12 @@ return [ 'redirect' => env('APP_URL') . '/login/service/google/callback', ], + 'ldap' => [ + 'server' => env('LDAP_SERVER', false), + 'dn' => env('LDAP_DN', false), + 'pass' => env('LDAP_PASS', false), + 'base_dn' => env('LDAP_BASE_DN', false), + 'user_filter' => env('LDAP_USER_FILTER', '(&(uid=${user}))') + ] + ]; diff --git a/resources/views/auth/forms/login/ldap.blade.php b/resources/views/auth/forms/login/ldap.blade.php new file mode 100644 index 000000000..aa9109345 --- /dev/null +++ b/resources/views/auth/forms/login/ldap.blade.php @@ -0,0 +1,9 @@ +
+ + @include('form/text', ['name' => 'email', 'tabindex' => 1]) +
+ +
+ + @include('form/password', ['name' => 'password', 'tabindex' => 2]) +
\ No newline at end of file diff --git a/resources/views/auth/forms/login/standard.blade.php b/resources/views/auth/forms/login/standard.blade.php new file mode 100644 index 000000000..d9be2935a --- /dev/null +++ b/resources/views/auth/forms/login/standard.blade.php @@ -0,0 +1,10 @@ +
+ + @include('form/text', ['name' => 'email', 'tabindex' => 1]) +
+ +
+ + @include('form/password', ['name' => 'password', 'tabindex' => 2]) + Forgot Password? +
\ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index eb9fdb44d..d1239b52c 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -15,16 +15,8 @@
{!! csrf_field() !!} -
- - @include('form/text', ['name' => 'email', 'tabindex' => 1]) -
-
- - @include('form/password', ['name' => 'password', 'tabindex' => 2]) - Forgot Password? -
+ @include('auth/forms/login/' . $authMethod)
@@ -34,7 +26,7 @@
- +
From 1c8c9e65c5379ed4b21b8f893f589df183fb5ff0 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Mon, 11 Jan 2016 22:41:05 +0000 Subject: [PATCH 05/11] Got LDAP auth working to a functional state --- app/Http/Controllers/Auth/AuthController.php | 24 +++- app/Http/routes.php | 2 +- app/Providers/AuthServiceProvider.php | 2 +- app/Providers/LdapUserProvider.php | 35 ++++-- app/Repos/UserRepo.php | 3 +- app/Role.php | 2 +- app/Services/LdapService.php | 115 ++++++++++++++---- config/auth.php | 2 +- ...1_11_210908_add_external_auth_to_users.php | 31 +++++ .../views/auth/forms/login/ldap.blade.php | 4 +- 10 files changed, 175 insertions(+), 45 deletions(-) create mode 100644 database/migrations/2016_01_11_210908_add_external_auth_to_users.php diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index c86e0d789..98ef67987 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -2,6 +2,7 @@ namespace BookStack\Http\Controllers\Auth; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Http\Request; use BookStack\Exceptions\SocialSignInException; use BookStack\Exceptions\UserRegistrationException; @@ -31,6 +32,8 @@ class AuthController extends Controller protected $redirectPath = '/'; protected $redirectAfterLogout = '/login'; + protected $username = 'email'; + protected $socialAuthService; protected $emailConfirmationService; @@ -48,6 +51,7 @@ class AuthController extends Controller $this->socialAuthService = $socialAuthService; $this->emailConfirmationService = $emailConfirmationService; $this->userRepo = $userRepo; + $this->username = config('auth.method') === 'standard' ? 'email' : 'username'; parent::__construct(); } @@ -104,6 +108,24 @@ class AuthController extends Controller return $this->registerUser($userData); } + + /** + * 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 Authenticatable $user + * @return \Illuminate\Http\RedirectResponse + */ + protected function authenticated(Request $request, Authenticatable $user) + { + if(!$user->exists) { + $user->save(); + $this->userRepo->attachDefaultRole($user); + auth()->login($user); + } + return redirect()->intended($this->redirectPath()); + } + /** * Register a new user after a registration callback. * @param $socialDriver @@ -232,7 +254,7 @@ class AuthController extends Controller public function getLogin() { $socialDrivers = $this->socialAuthService->getActiveDrivers(); - $authMethod = 'standard'; // TODO - rewrite to use config. + $authMethod = config('auth.method'); return view('auth/login', ['socialDrivers' => $socialDrivers, 'authMethod' => $authMethod]); } diff --git a/app/Http/routes.php b/app/Http/routes.php index a8eb6b6e4..aedfca9bc 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -3,7 +3,7 @@ Route::get('/test', function() { // TODO - remove this $service = new \BookStack\Services\LdapService(); - $service->getUserDetails('ssmith'); + dd($service->getUserDetails('ksmith')); }); // Authenticated routes... diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 40e94b016..c027578a7 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -25,7 +25,7 @@ class AuthServiceProvider extends ServiceProvider public function register() { Auth::provider('ldap', function($app, array $config) { - return new LdapUserProvider($config['model']); + return new LdapUserProvider($config['model'], $app['BookStack\Services\LdapService']); }); } } diff --git a/app/Providers/LdapUserProvider.php b/app/Providers/LdapUserProvider.php index c2b961a34..407791a7d 100644 --- a/app/Providers/LdapUserProvider.php +++ b/app/Providers/LdapUserProvider.php @@ -3,6 +3,8 @@ namespace BookStack\Providers; +use BookStack\Role; +use BookStack\Services\LdapService; use BookStack\User; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Auth\UserProvider; @@ -17,14 +19,21 @@ class LdapUserProvider implements UserProvider */ protected $model; + /** + * @var LdapService + */ + protected $ldapService; + /** * LdapUserProvider constructor. - * @param $model + * @param $model + * @param LdapService $ldapService */ - public function __construct($model) + public function __construct($model, LdapService $ldapService) { $this->model = $model; + $this->ldapService = $ldapService; } /** @@ -34,8 +43,7 @@ class LdapUserProvider implements UserProvider */ public function createModel() { - $class = '\\'.ltrim($this->model, '\\'); - + $class = '\\' . ltrim($this->model, '\\'); return new $class; } @@ -55,7 +63,7 @@ class LdapUserProvider implements UserProvider * Retrieve a user by their unique identifier and "remember me" token. * * @param mixed $identifier - * @param string $token + * @param string $token * @return \Illuminate\Contracts\Auth\Authenticatable|null */ public function retrieveByToken($identifier, $token) @@ -91,16 +99,21 @@ class LdapUserProvider implements UserProvider */ public function retrieveByCredentials(array $credentials) { - // TODO: Implement retrieveByCredentials() method. - // Get user via LDAP + $userDetails = $this->ldapService->getUserDetails($credentials['username']); + if ($userDetails === null) return null; // Search current user base by looking up a uid + $model = $this->createModel(); + $currentUser = $model->newQuery() + ->where('external_auth_id', $userDetails['uid']) + ->first(); - // If not exists create a new user instance with attached role - // but do not store it in the database yet + if ($currentUser !== null) return $currentUser; - // + $model->name = $userDetails['name']; + $model->external_auth_id = $userDetails['uid']; + return $model; } /** @@ -112,6 +125,6 @@ class LdapUserProvider implements UserProvider */ public function validateCredentials(Authenticatable $user, array $credentials) { - // TODO: Implement validateCredentials() method. + return $this->ldapService->validateUserCredentials($user, $credentials['username'], $credentials['password']); } } diff --git a/app/Repos/UserRepo.php b/app/Repos/UserRepo.php index fecd7c88b..88918910a 100644 --- a/app/Repos/UserRepo.php +++ b/app/Repos/UserRepo.php @@ -3,6 +3,7 @@ use BookStack\Role; use BookStack\User; +use Setting; class UserRepo { @@ -56,7 +57,7 @@ class UserRepo */ public function attachDefaultRole($user) { - $roleId = \Setting::get('registration-role'); + $roleId = Setting::get('registration-role'); if ($roleId === false) $roleId = $this->role->getDefault()->id; $user->attachRoleId($roleId); } diff --git a/app/Role.php b/app/Role.php index c698a1cf6..3d93bf770 100644 --- a/app/Role.php +++ b/app/Role.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model; class Role extends Model { /** - * Sets the default role name for newly registed users. + * Sets the default role name for newly registered users. * @var string */ protected static $default = 'viewer'; diff --git a/app/Services/LdapService.php b/app/Services/LdapService.php index a540ab58b..bceed682a 100644 --- a/app/Services/LdapService.php +++ b/app/Services/LdapService.php @@ -2,18 +2,94 @@ use BookStack\Exceptions\LdapException; +use Illuminate\Contracts\Auth\Authenticatable; class LdapService { + protected $ldapConnection; + + /** + * Get the details of a user from LDAP using the given username. + * User found via configurable user filter. + * @param $userName + * @return array|null + * @throws LdapException + */ public function getUserDetails($userName) { + $ldapConnection = $this->getConnection(); - if(!function_exists('ldap_connect')) { + // Find user + $userFilter = $this->buildFilter(config('services.ldap.user_filter'), ['user' => $userName]); + $baseDn = config('services.ldap.base_dn'); + $ldapSearch = ldap_search($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn']); + $users = ldap_get_entries($ldapConnection, $ldapSearch); + if ($users['count'] === 0) return null; + + $user = $users[0]; + return [ + 'uid' => $user['uid'][0], + 'name' => $user['cn'][0], + 'dn' => $user['dn'] + ]; + } + + /** + * @param Authenticatable $user + * @param string $username + * @param string $password + * @return bool + * @throws LdapException + */ + public function validateUserCredentials(Authenticatable $user, $username, $password) + { + $ldapUser = $this->getUserDetails($username); + if ($ldapUser === null) return false; + if ($ldapUser['uid'] !== $user->external_auth_id) return false; + + $ldapConnection = $this->getConnection(); + $ldapBind = @ldap_bind($ldapConnection, $ldapUser['dn'], $password); + return $ldapBind; + } + + /** + * Bind the system user to the LDAP connection using the given credentials + * otherwise anonymous access is attempted. + * @param $connection + * @throws LdapException + */ + protected function bindSystemUser($connection) + { + $ldapDn = config('services.ldap.dn'); + $ldapPass = config('services.ldap.pass'); + + $isAnonymous = ($ldapDn === false || $ldapPass === false); + if ($isAnonymous) { + $ldapBind = ldap_bind($connection); + } else { + $ldapBind = ldap_bind($connection, $ldapDn, $ldapPass); + } + + if (!$ldapBind) throw new LdapException('LDAP access failed using ' . $isAnonymous ? ' anonymous bind.' : ' given dn & pass details'); + } + + /** + * Get the connection to the LDAP server. + * Creates a new connection if one does not exist. + * @return resource + * @throws LdapException + */ + protected function getConnection() + { + if ($this->ldapConnection !== null) return $this->ldapConnection; + + // Check LDAP extension in installed + if (!function_exists('ldap_connect')) { throw new LdapException('LDAP PHP extension not installed'); } - + // Get port from server string if specified. $ldapServer = explode(':', config('services.ldap.server')); $ldapConnection = ldap_connect($ldapServer[0], count($ldapServer) > 1 ? $ldapServer[1] : 389); @@ -21,37 +97,24 @@ class LdapService throw new LdapException('Cannot connect to ldap server, Initial connection failed'); } - // Options - + // Set any required options ldap_set_option($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, 3); // TODO - make configurable - $ldapDn = config('services.ldap.dn'); - $ldapPass = config('services.ldap.pass'); - $isAnonymous = ($ldapDn === false || $ldapPass === false); - if ($isAnonymous) { - $ldapBind = ldap_bind($ldapConnection); - } else { - $ldapBind = ldap_bind($ldapConnection, $ldapDn, $ldapPass); - } - - if (!$ldapBind) throw new LdapException('LDAP access failed using ' . $isAnonymous ? ' anonymous bind.' : ' given dn & pass details'); - - // Find user - $userFilter = $this->buildFilter(config('services.ldap.user_filter'), ['user' => $userName]); - //dd($userFilter); - $baseDn = config('services.ldap.base_dn'); - $ldapSearch = ldap_search($ldapConnection, $baseDn, $userFilter); - $users = ldap_get_entries($ldapConnection, $ldapSearch); - - dd($users); + $this->ldapConnection = $ldapConnection; + return $this->ldapConnection; } - - private function buildFilter($filterString, $attrs) + /** + * Build a filter string by injecting common variables. + * @param $filterString + * @param array $attrs + * @return string + */ + protected function buildFilter($filterString, array $attrs) { $newAttrs = []; foreach ($attrs as $key => $attrText) { - $newKey = '${'.$key.'}'; + $newKey = '${' . $key . '}'; $newAttrs[$newKey] = $attrText; } return strtr($filterString, $newAttrs); diff --git a/config/auth.php b/config/auth.php index 55d434cdf..0f2d5a69c 100644 --- a/config/auth.php +++ b/config/auth.php @@ -70,7 +70,7 @@ return [ 'providers' => [ 'users' => [ 'driver' => env('AUTH_METHOD', 'eloquent'), - 'model' => Bookstack\User::class, + 'model' => BookStack\User::class, ], // 'users' => [ diff --git a/database/migrations/2016_01_11_210908_add_external_auth_to_users.php b/database/migrations/2016_01_11_210908_add_external_auth_to_users.php new file mode 100644 index 000000000..dda8f3d74 --- /dev/null +++ b/database/migrations/2016_01_11_210908_add_external_auth_to_users.php @@ -0,0 +1,31 @@ +string('external_auth_id')->index(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('external_auth_id'); + }); + } +} diff --git a/resources/views/auth/forms/login/ldap.blade.php b/resources/views/auth/forms/login/ldap.blade.php index aa9109345..eb0a3182f 100644 --- a/resources/views/auth/forms/login/ldap.blade.php +++ b/resources/views/auth/forms/login/ldap.blade.php @@ -1,6 +1,6 @@
- - @include('form/text', ['name' => 'email', 'tabindex' => 1]) + + @include('form/text', ['name' => 'username', 'tabindex' => 1])
From 14feef3679b6ecdce656d56dd754357997084632 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Wed, 13 Jan 2016 22:22:30 +0000 Subject: [PATCH 06/11] Updated user interfaces for LDAP and added email from LDAP --- app/Http/Controllers/Auth/AuthController.php | 15 ++++++++-- app/Http/Controllers/UserController.php | 16 ++++++++-- app/Providers/LdapUserProvider.php | 2 +- app/Repos/UserRepo.php | 2 +- app/Services/LdapService.php | 5 ++-- app/Services/SettingService.php | 28 +++++++++++++++-- app/User.php | 4 +-- config/auth.php | 2 +- phpunit.xml | 1 + .../views/auth/forms/login/ldap.blade.php | 10 +++++++ resources/views/users/create.blade.php | 2 +- resources/views/users/edit.blade.php | 2 +- resources/views/users/forms/ldap.blade.php | 30 +++++++++++++++++++ .../standard.blade.php} | 8 ++--- 14 files changed, 106 insertions(+), 21 deletions(-) create mode 100644 resources/views/users/forms/ldap.blade.php rename resources/views/users/{form.blade.php => forms/standard.blade.php} (81%) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 98ef67987..21abfb24c 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -118,11 +118,22 @@ class AuthController extends Controller */ protected function authenticated(Request $request, Authenticatable $user) { + if(!$user->exists && $user->email === null && !$request->has('email')) { + $request->flash(); + session()->flash('request-email', true); + return redirect('/login'); + } + + if(!$user->exists && $user->email === null && $request->has('email')) { + $user->email = $request->get('email'); + } + if(!$user->exists) { $user->save(); $this->userRepo->attachDefaultRole($user); auth()->login($user); } + return redirect()->intended($this->redirectPath()); } @@ -183,7 +194,7 @@ class AuthController extends Controller } /** - * Show the page to tell the user to check thier email + * Show the page to tell the user to check their email * and confirm their address. */ public function getRegisterConfirmation() @@ -243,7 +254,7 @@ class AuthController extends Controller ]); $user = $this->userRepo->getByEmail($request->get('email')); $this->emailConfirmationService->sendConfirmation($user); - \Session::flash('success', 'Confirmation email resent, Please check your inbox.'); + session()->flash('success', 'Confirmation email resent, Please check your inbox.'); return redirect('/register/confirm'); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 9184b245e..f504f4477 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -46,7 +46,8 @@ class UserController extends Controller public function create() { $this->checkPermission('user-create'); - return view('users/create'); + $authMethod = config('auth.method'); + return view('users/create', ['authMethod' => $authMethod]); } /** @@ -94,10 +95,12 @@ class UserController extends Controller return $this->currentUser->id == $id; }); + $authMethod = config('auth.method'); + $user = $this->user->findOrFail($id); $activeSocialDrivers = $socialAuthService->getActiveDrivers(); $this->setPageTitle('User Profile'); - return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers]); + return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod]); } /** @@ -124,17 +127,24 @@ class UserController extends Controller ]); $user = $this->user->findOrFail($id); - $user->fill($request->except('password')); + $user->fill($request->all()); + // Role updates if ($this->currentUser->can('user-update') && $request->has('role')) { $user->attachRoleId($request->get('role')); } + // Password updates if ($request->has('password') && $request->get('password') != '') { $password = $request->get('password'); $user->password = bcrypt($password); } + // External auth id updates + if ($this->currentUser->can('user-update') && $request->has('external_auth_id')) { + $user->external_auth_id = $request->get('external_auth_id'); + } + $user->save(); return redirect('/users'); } diff --git a/app/Providers/LdapUserProvider.php b/app/Providers/LdapUserProvider.php index 407791a7d..98cfc8340 100644 --- a/app/Providers/LdapUserProvider.php +++ b/app/Providers/LdapUserProvider.php @@ -87,7 +87,6 @@ class LdapUserProvider implements UserProvider public function updateRememberToken(Authenticatable $user, $token) { $user->setRememberToken($token); - $user->save(); } @@ -113,6 +112,7 @@ class LdapUserProvider implements UserProvider $model->name = $userDetails['name']; $model->external_auth_id = $userDetails['uid']; + $model->email = $userDetails['email']; return $model; } diff --git a/app/Repos/UserRepo.php b/app/Repos/UserRepo.php index 88918910a..77ad22f39 100644 --- a/app/Repos/UserRepo.php +++ b/app/Repos/UserRepo.php @@ -88,7 +88,7 @@ class UserRepo */ public function create(array $data) { - return $this->user->create([ + return $this->user->forceCreate([ 'name' => $data['name'], 'email' => $data['email'], 'password' => bcrypt($data['password']) diff --git a/app/Services/LdapService.php b/app/Services/LdapService.php index bceed682a..cd80290e4 100644 --- a/app/Services/LdapService.php +++ b/app/Services/LdapService.php @@ -23,7 +23,7 @@ class LdapService // Find user $userFilter = $this->buildFilter(config('services.ldap.user_filter'), ['user' => $userName]); $baseDn = config('services.ldap.base_dn'); - $ldapSearch = ldap_search($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn']); + $ldapSearch = ldap_search($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn', 'mail']); $users = ldap_get_entries($ldapConnection, $ldapSearch); if ($users['count'] === 0) return null; @@ -31,7 +31,8 @@ class LdapService return [ 'uid' => $user['uid'][0], 'name' => $user['cn'][0], - 'dn' => $user['dn'] + 'dn' => $user['dn'], + 'email' => (isset($user['mail'])) ? $user['mail'][0] : null ]; } diff --git a/app/Services/SettingService.php b/app/Services/SettingService.php index 7f2549c7d..bcc7eae31 100644 --- a/app/Services/SettingService.php +++ b/app/Services/SettingService.php @@ -38,7 +38,7 @@ class SettingService */ public function get($key, $default = false) { - $value = $this->getValueFromStore($key, $default); + $value = $this->getValueFromStore($key, $default); return $this->formatValue($value, $default); } @@ -50,13 +50,17 @@ class SettingService */ protected function getValueFromStore($key, $default) { + $overrideValue = $this->getOverrideValue($key); + if ($overrideValue !== null) return $overrideValue; + $cacheKey = $this->cachePrefix . $key; if ($this->cache->has($cacheKey)) { return $this->cache->get($cacheKey); } $settingObject = $this->getSettingObjectByKey($key); - if($settingObject !== null) { + + if ($settingObject !== null) { $value = $settingObject->value; $this->cache->forever($cacheKey, $value); return $value; @@ -65,6 +69,10 @@ class SettingService return $default; } + /** + * Clear an item from the cache completely. + * @param $key + */ protected function clearFromCache($key) { $cacheKey = $this->cachePrefix . $key; @@ -136,9 +144,23 @@ class SettingService * @param $key * @return mixed */ - private function getSettingObjectByKey($key) + protected function getSettingObjectByKey($key) { return $this->setting->where('setting_key', '=', $key)->first(); } + + /** + * Returns an override value for a setting based on certain app conditions. + * Used where certain configuration options overrule others. + * Returns null if no override value is available. + * @param $key + * @return bool|null + */ + protected function getOverrideValue($key) + { + if ($key === 'registration-enabled' && config('auth.method') === 'ldap') return false; + return null; + } + } \ No newline at end of file diff --git a/app/User.php b/app/User.php index 1be98c3c4..4a5914afd 100644 --- a/app/User.php +++ b/app/User.php @@ -24,7 +24,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon * * @var array */ - protected $fillable = ['name', 'email', 'password', 'image_id']; + protected $fillable = ['name', 'email', 'image_id']; /** * The attributes excluded from the model's JSON form. @@ -68,7 +68,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon } /** - * Loads the user's permissions from thier role. + * Loads the user's permissions from their role. */ private function loadPermissions() { diff --git a/config/auth.php b/config/auth.php index 0f2d5a69c..ceeab5c71 100644 --- a/config/auth.php +++ b/config/auth.php @@ -69,7 +69,7 @@ return [ 'providers' => [ 'users' => [ - 'driver' => env('AUTH_METHOD', 'eloquent'), + 'driver' => env('AUTH_METHOD', 'standard') === 'standard' ? 'eloquent' : env('AUTH_METHOD'), 'model' => BookStack\User::class, ], diff --git a/phpunit.xml b/phpunit.xml index 1704159e2..48c0dde22 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -26,6 +26,7 @@ + diff --git a/resources/views/auth/forms/login/ldap.blade.php b/resources/views/auth/forms/login/ldap.blade.php index eb0a3182f..5230d43ca 100644 --- a/resources/views/auth/forms/login/ldap.blade.php +++ b/resources/views/auth/forms/login/ldap.blade.php @@ -3,6 +3,16 @@ @include('form/text', ['name' => 'username', 'tabindex' => 1])
+@if(session('request-email', false) === true) +
+ + @include('form/text', ['name' => 'email', 'tabindex' => 1]) + + Please enter an email to use for this account. + +
+@endif +
@include('form/password', ['name' => 'password', 'tabindex' => 2]) diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index f20ae6fc4..e6398b867 100644 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -8,7 +8,7 @@
{!! csrf_field() !!} - @include('users/form') + @include('users.forms.' . $authMethod)
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index e7100bdb1..59457eb15 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -25,7 +25,7 @@

Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}

{!! csrf_field() !!} - @include('users/form', ['model' => $user]) + @include('users.forms.' . $authMethod, ['model' => $user])
diff --git a/resources/views/users/forms/ldap.blade.php b/resources/views/users/forms/ldap.blade.php new file mode 100644 index 000000000..3897dfd9a --- /dev/null +++ b/resources/views/users/forms/ldap.blade.php @@ -0,0 +1,30 @@ +
+ + @include('form.text', ['name' => 'name']) +
+ +@if($currentUser->can('user-update')) +
+ + @include('form.text', ['name' => 'email']) +
+@endif + +@if($currentUser->can('user-update')) +
+ + @include('form.role-select', ['name' => 'role', 'options' => \BookStack\Role::all(), 'displayKey' => 'display_name']) +
+@endif + +@if($currentUser->can('user-update')) +
+ + @include('form.text', ['name' => 'external_auth_id']) +
+@endif + +
+ Cancel + +
\ No newline at end of file diff --git a/resources/views/users/form.blade.php b/resources/views/users/forms/standard.blade.php similarity index 81% rename from resources/views/users/form.blade.php rename to resources/views/users/forms/standard.blade.php index 16176bb8d..7960a7ed5 100644 --- a/resources/views/users/form.blade.php +++ b/resources/views/users/forms/standard.blade.php @@ -1,11 +1,11 @@
- @include('form/text', ['name' => 'name']) + @include('form.text', ['name' => 'name'])
- @include('form/text', ['name' => 'email']) + @include('form.text', ['name' => 'email'])
@if($currentUser->can('user-update')) @@ -25,12 +25,12 @@
- @include('form/password', ['name' => 'password']) + @include('form.password', ['name' => 'password'])
- @include('form/password', ['name' => 'password-confirm']) + @include('form.password', ['name' => 'password-confirm'])
From 0821672e70cf9eb81091032514634b299cc5900b Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 15 Jan 2016 23:21:47 +0000 Subject: [PATCH 07/11] Cleaned tests up, Started LDAP tests, Created LDAP wrapper --- .env.example | 8 ++ app/Http/Controllers/Auth/AuthController.php | 9 +- app/Http/Middleware/Authenticate.php | 1 + app/Http/routes.php | 6 -- app/Providers/LdapUserProvider.php | 7 +- app/Services/Ldap.php | 86 ++++++++++++++++++++ app/Services/LdapService.php | 57 +++++++++---- config/services.php | 3 +- resources/views/public.blade.php | 17 ++-- tests/ActivityTrackingTest.php | 4 +- tests/{ => Auth}/AuthTest.php | 58 +++++++++---- tests/Auth/LdapTest.php | 43 ++++++++++ tests/{ => Auth}/SocialAuthTest.php | 11 +-- tests/EntityTest.php | 20 ++--- tests/PublicViewTest.php | 8 +- 15 files changed, 259 insertions(+), 79 deletions(-) create mode 100644 app/Services/Ldap.php rename tests/{ => Auth}/AuthTest.php (78%) create mode 100644 tests/Auth/LdapTest.php rename tests/{ => Auth}/SocialAuthTest.php (82%) diff --git a/.env.example b/.env.example index 00d230bff..d32d96c0d 100644 --- a/.env.example +++ b/.env.example @@ -36,6 +36,14 @@ APP_URL=http://bookstack.dev # External services such as Gravatar DISABLE_EXTERNAL_SERVICES=false +# LDAP Settings +LDAP_SERVER=false +LDAP_BASE_DN=false +LDAP_DN=false +LDAP_PASS=false +LDAP_USER_FILTER=false +LDAP_VERSION=false + # Mail settings MAIL_DRIVER=smtp MAIL_HOST=localhost diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 21abfb24c..d601b4985 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -118,17 +118,20 @@ class AuthController extends Controller */ protected function authenticated(Request $request, Authenticatable $user) { - if(!$user->exists && $user->email === null && !$request->has('email')) { + // Explicitly log them out for now if they do no exist. + if (!$user->exists) auth()->logout($user); + + if (!$user->exists && $user->email === null && !$request->has('email')) { $request->flash(); session()->flash('request-email', true); return redirect('/login'); } - if(!$user->exists && $user->email === null && $request->has('email')) { + if (!$user->exists && $user->email === null && $request->has('email')) { $user->email = $request->get('email'); } - if(!$user->exists) { + if (!$user->exists) { $user->save(); $this->userRepo->attachDefaultRole($user); auth()->login($user); diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index ebd830ffe..ad804d0d8 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -38,6 +38,7 @@ class Authenticate if(auth()->check() && auth()->user()->email_confirmed == false) { return redirect()->guest('/register/confirm/awaiting'); } + if ($this->auth->guest() && !Setting::get('app-public')) { if ($request->ajax()) { return response('Unauthorized.', 401); diff --git a/app/Http/routes.php b/app/Http/routes.php index aedfca9bc..23d4c33ab 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -1,11 +1,5 @@ getUserDetails('ksmith')); -}); - // Authenticated routes... Route::group(['middleware' => 'auth'], function () { diff --git a/app/Providers/LdapUserProvider.php b/app/Providers/LdapUserProvider.php index 98cfc8340..30fa739c2 100644 --- a/app/Providers/LdapUserProvider.php +++ b/app/Providers/LdapUserProvider.php @@ -86,8 +86,10 @@ class LdapUserProvider implements UserProvider */ public function updateRememberToken(Authenticatable $user, $token) { - $user->setRememberToken($token); - $user->save(); + if ($user->exists) { + $user->setRememberToken($token); + $user->save(); + } } /** @@ -113,6 +115,7 @@ class LdapUserProvider implements UserProvider $model->name = $userDetails['name']; $model->external_auth_id = $userDetails['uid']; $model->email = $userDetails['email']; + $model->email_confirmed = true; return $model; } diff --git a/app/Services/Ldap.php b/app/Services/Ldap.php new file mode 100644 index 000000000..cfefbb4b6 --- /dev/null +++ b/app/Services/Ldap.php @@ -0,0 +1,86 @@ +search($ldapConnection, $baseDn, $filter, $attributes); + return $this->getEntries($ldapConnection, $search); + } + + /** + * Bind to LDAP directory. + * @param resource $ldapConnection + * @param string $bindRdn + * @param string $bindPassword + * @return bool + */ + public function bind($ldapConnection, $bindRdn = null, $bindPassword = null) + { + return ldap_bind($ldapConnection, $bindRdn, $bindPassword); + } + +} \ No newline at end of file diff --git a/app/Services/LdapService.php b/app/Services/LdapService.php index cd80290e4..d33f8c378 100644 --- a/app/Services/LdapService.php +++ b/app/Services/LdapService.php @@ -4,10 +4,27 @@ use BookStack\Exceptions\LdapException; use Illuminate\Contracts\Auth\Authenticatable; +/** + * Class LdapService + * Handles any app-specific LDAP tasks. + * @package BookStack\Services + */ class LdapService { + protected $ldap; protected $ldapConnection; + protected $config; + + /** + * LdapService constructor. + * @param Ldap $ldap + */ + public function __construct(Ldap $ldap) + { + $this->ldap = $ldap; + $this->config = config('services.ldap'); + } /** * Get the details of a user from LDAP using the given username. @@ -21,17 +38,16 @@ class LdapService $ldapConnection = $this->getConnection(); // Find user - $userFilter = $this->buildFilter(config('services.ldap.user_filter'), ['user' => $userName]); - $baseDn = config('services.ldap.base_dn'); - $ldapSearch = ldap_search($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn', 'mail']); - $users = ldap_get_entries($ldapConnection, $ldapSearch); + $userFilter = $this->buildFilter($this->config['user_filter'], ['user' => $userName]); + $baseDn = $this->config['base_dn']; + $users = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn', 'mail']); if ($users['count'] === 0) return null; $user = $users[0]; return [ - 'uid' => $user['uid'][0], - 'name' => $user['cn'][0], - 'dn' => $user['dn'], + 'uid' => $user['uid'][0], + 'name' => $user['cn'][0], + 'dn' => $user['dn'], 'email' => (isset($user['mail'])) ? $user['mail'][0] : null ]; } @@ -50,7 +66,12 @@ class LdapService if ($ldapUser['uid'] !== $user->external_auth_id) return false; $ldapConnection = $this->getConnection(); - $ldapBind = @ldap_bind($ldapConnection, $ldapUser['dn'], $password); + try { + $ldapBind = $this->ldap->bind($ldapConnection, $ldapUser['dn'], $password); + } catch (\ErrorException $e) { + $ldapBind = false; + } + return $ldapBind; } @@ -62,14 +83,14 @@ class LdapService */ protected function bindSystemUser($connection) { - $ldapDn = config('services.ldap.dn'); - $ldapPass = config('services.ldap.pass'); + $ldapDn = $this->config['dn']; + $ldapPass = $this->config['pass']; $isAnonymous = ($ldapDn === false || $ldapPass === false); if ($isAnonymous) { - $ldapBind = ldap_bind($connection); + $ldapBind = $this->ldap->bind($connection); } else { - $ldapBind = ldap_bind($connection, $ldapDn, $ldapPass); + $ldapBind = $this->ldap->bind($connection, $ldapDn, $ldapPass); } if (!$ldapBind) throw new LdapException('LDAP access failed using ' . $isAnonymous ? ' anonymous bind.' : ' given dn & pass details'); @@ -86,20 +107,22 @@ class LdapService if ($this->ldapConnection !== null) return $this->ldapConnection; // Check LDAP extension in installed - if (!function_exists('ldap_connect')) { + if (!function_exists('ldap_connect') && config('app.env') !== 'testing') { throw new LdapException('LDAP PHP extension not installed'); } // Get port from server string if specified. - $ldapServer = explode(':', config('services.ldap.server')); - $ldapConnection = ldap_connect($ldapServer[0], count($ldapServer) > 1 ? $ldapServer[1] : 389); + $ldapServer = explode(':', $this->config['server']); + $ldapConnection = $this->ldap->connect($ldapServer[0], count($ldapServer) > 1 ? $ldapServer[1] : 389); if ($ldapConnection === false) { throw new LdapException('Cannot connect to ldap server, Initial connection failed'); } // Set any required options - ldap_set_option($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, 3); // TODO - make configurable + if ($this->config['version']) { + $this->ldap->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $this->config['version']); + } $this->ldapConnection = $ldapConnection; return $this->ldapConnection; @@ -107,7 +130,7 @@ class LdapService /** * Build a filter string by injecting common variables. - * @param $filterString + * @param string $filterString * @param array $attrs * @return string */ diff --git a/config/services.php b/config/services.php index 08c2f3217..d71ff4a26 100644 --- a/config/services.php +++ b/config/services.php @@ -54,7 +54,8 @@ return [ 'dn' => env('LDAP_DN', false), 'pass' => env('LDAP_PASS', false), 'base_dn' => env('LDAP_BASE_DN', false), - 'user_filter' => env('LDAP_USER_FILTER', '(&(uid=${user}))') + 'user_filter' => env('LDAP_USER_FILTER', '(&(uid=${user}))'), + 'version' => env('LDAP_VERSION', false) ] ]; diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php index 52c287987..d34c490a7 100644 --- a/resources/views/public.blade.php +++ b/resources/views/public.blade.php @@ -5,19 +5,19 @@ + - - + - + @include('partials/notifications') @@ -37,12 +37,15 @@ @yield('header-buttons')
@if(isset($signedIn) && $signedIn) - {{ $currentUser->name }} -
- - {{ $currentUser->name }} +
+ + {{ $currentUser->name }} + {{ $currentUser->name }}
    +
  • + Edit Profile +
  • Logout
    • diff --git a/tests/ActivityTrackingTest.php b/tests/ActivityTrackingTest.php index 8a237f880..8ee20ab6b 100644 --- a/tests/ActivityTrackingTest.php +++ b/tests/ActivityTrackingTest.php @@ -7,7 +7,7 @@ use Illuminate\Foundation\Testing\DatabaseTransactions; class ActivityTrackingTest extends TestCase { - public function testRecentlyViewedBooks() + public function test_recently_viewed_books() { $books = \BookStack\Book::all()->take(10); @@ -21,7 +21,7 @@ class ActivityTrackingTest extends TestCase ->seeInElement('#recents', $books[1]->name); } - public function testPopularBooks() + public function test_popular_books() { $books = \BookStack\Book::all()->take(10); diff --git a/tests/AuthTest.php b/tests/Auth/AuthTest.php similarity index 78% rename from tests/AuthTest.php rename to tests/Auth/AuthTest.php index 3faae6506..022dc14fb 100644 --- a/tests/AuthTest.php +++ b/tests/Auth/AuthTest.php @@ -5,23 +5,19 @@ use BookStack\EmailConfirmation; class AuthTest extends TestCase { - public function testAuthWorking() + public function test_auth_working() { $this->visit('/') ->seePageIs('/login'); } - public function testLogin() + public function test_login() { - $this->visit('/') - ->seePageIs('/login'); - $this->login('admin@admin.com', 'password') - ->seePageIs('/') - ->see('BookStack'); + ->seePageIs('/'); } - public function testPublicViewing() + public function test_public_viewing() { $settings = app('BookStack\Services\SettingService'); $settings->put('app-public', 'true'); @@ -30,7 +26,7 @@ class AuthTest extends TestCase ->see('Sign In'); } - public function testRegistrationShowing() + public function test_registration_showing() { // Ensure registration form is showing $this->setSettings(['registration-enabled' => 'true']); @@ -40,7 +36,7 @@ class AuthTest extends TestCase ->seePageIs('/register'); } - public function testNormalRegistration() + public function test_normal_registration() { // Set settings and get user instance $this->setSettings(['registration-enabled' => 'true']); @@ -58,7 +54,8 @@ class AuthTest extends TestCase ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email]); } - public function testConfirmedRegistration() + + public function test_confirmed_registration() { // Set settings and get user instance $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']); @@ -102,7 +99,32 @@ class AuthTest extends TestCase ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => true]); } - public function testUserCreation() + public function test_restricted_registration() + { + $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true', 'registration-restrict' => 'example.com']); + $user = factory(\BookStack\User::class)->make(); + // Go through registration process + $this->visit('/register') + ->type($user->name, '#name') + ->type($user->email, '#email') + ->type($user->password, '#password') + ->press('Create Account') + ->seePageIs('/register') + ->dontSeeInDatabase('users', ['email' => $user->email]) + ->see('That email domain does not have access to this application'); + + $user->email = 'barry@example.com'; + + $this->visit('/register') + ->type($user->name, '#name') + ->type($user->email, '#email') + ->type($user->password, '#password') + ->press('Create Account') + ->seePageIs('/register/confirm') + ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]); + } + + public function test_user_creation() { $user = factory(\BookStack\User::class)->make(); @@ -120,7 +142,7 @@ class AuthTest extends TestCase ->see($user->name); } - public function testUserUpdating() + public function test_user_updating() { $user = \BookStack\User::all()->last(); $password = $user->password; @@ -136,7 +158,7 @@ class AuthTest extends TestCase ->notSeeInDatabase('users', ['name' => $user->name]); } - public function testUserPasswordUpdate() + public function test_user_password_update() { $user = \BookStack\User::all()->last(); $userProfilePage = '/users/' . $user->id; @@ -156,7 +178,7 @@ class AuthTest extends TestCase $this->assertTrue(Hash::check('newpassword', $userPassword)); } - public function testUserDeletion() + public function test_user_deletion() { $userDetails = factory(\BookStack\User::class)->make(); $user = $this->getNewUser($userDetails->toArray()); @@ -170,7 +192,7 @@ class AuthTest extends TestCase ->notSeeInDatabase('users', ['name' => $user->name]); } - public function testUserCannotBeDeletedIfLastAdmin() + public function test_user_cannot_be_deleted_if_last_admin() { $adminRole = \BookStack\Role::getRole('admin'); // Ensure we currently only have 1 admin user @@ -184,7 +206,7 @@ class AuthTest extends TestCase ->see('You cannot delete the only admin'); } - public function testLogout() + public function test_logout() { $this->asAdmin() ->visit('/') @@ -200,7 +222,7 @@ class AuthTest extends TestCase * @param string $password * @return $this */ - private function login($email, $password) + protected function login($email, $password) { return $this->visit('/login') ->type($email, '#email') diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php new file mode 100644 index 000000000..6b026dab9 --- /dev/null +++ b/tests/Auth/LdapTest.php @@ -0,0 +1,43 @@ +set(['auth.method' => 'ldap', 'services.ldap.base_dn' => 'dc=ldap,dc=local', 'auth.providers.users.driver' => 'ldap']); + $this->mockLdap = Mockery::mock(BookStack\Services\Ldap::class); + $this->app['BookStack\Services\Ldap'] = $this->mockLdap; + $this->mockUser = factory(User::class)->make(); + } + + public function test_ldap_login() + { + $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId); + $this->mockLdap->shouldReceive('setOption')->once(); + $this->mockLdap->shouldReceive('searchAndGetEntries')->twice() + ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array')) + ->andReturn(['count' => 1, 0 => [ + 'uid' => [$this->mockUser->name], + 'cn' => [$this->mockUser->name], + 'dn' => ['dc=test'.config('services.ldap.base_dn')] + ]]); + $this->mockLdap->shouldReceive('bind')->times(1)->andReturn(true); + + $this->visit('/login') + ->see('Username') + ->type($this->mockUser->name, '#username') + ->type($this->mockUser->password, '#password') + ->press('Sign In') + ->seePageIs('/login')->see('Please enter an email to use for this account.'); + } + +} \ No newline at end of file diff --git a/tests/SocialAuthTest.php b/tests/Auth/SocialAuthTest.php similarity index 82% rename from tests/SocialAuthTest.php rename to tests/Auth/SocialAuthTest.php index 820ecd4dd..d5a7e6921 100644 --- a/tests/SocialAuthTest.php +++ b/tests/Auth/SocialAuthTest.php @@ -3,13 +3,13 @@ class SocialAuthTest extends TestCase { - public function testSocialRegistration() + public function test_social_registration() { // http://docs.mockery.io/en/latest/reference/startup_methods.html $user = factory(\BookStack\User::class)->make(); $this->setSettings(['registration-enabled' => 'true']); - $this->setEnvironment(['GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']); + config(['GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']); $mockSocialite = Mockery::mock('Laravel\Socialite\Contracts\Factory'); $this->app['Laravel\Socialite\Contracts\Factory'] = $mockSocialite; @@ -32,11 +32,4 @@ class SocialAuthTest extends TestCase $this->seeInDatabase('social_accounts', ['user_id' => $user->id]); } - protected function setEnvironment($array) - { - foreach ($array as $key => $value) { - putenv("$key=$value"); - } - } - } diff --git a/tests/EntityTest.php b/tests/EntityTest.php index 1eda7c73c..5bfedb535 100644 --- a/tests/EntityTest.php +++ b/tests/EntityTest.php @@ -5,7 +5,7 @@ use Illuminate\Support\Facades\DB; class EntityTest extends TestCase { - public function testEntityCreation() + public function test_entity_creation() { // Test Creation @@ -51,7 +51,7 @@ class EntityTest extends TestCase return \BookStack\Book::find($book->id); } - public function testBookSortPageShows() + public function test_book_sort_page_shows() { $books = \BookStack\Book::all(); $bookToSort = $books[0]; @@ -65,7 +65,7 @@ class EntityTest extends TestCase ->see($books[1]->name); } - public function testBookSortItemReturnsBookContent() + public function test_book_sort_item_returns_book_content() { $books = \BookStack\Book::all(); $bookToSort = $books[0]; @@ -155,7 +155,7 @@ class EntityTest extends TestCase return $book; } - public function testPageSearch() + public function test_page_search() { $book = \BookStack\Book::all()->first(); $page = $book->pages->first(); @@ -170,7 +170,7 @@ class EntityTest extends TestCase ->seePageIs($page->getUrl()); } - public function testInvalidPageSearch() + public function test_invalid_page_search() { $this->asAdmin() ->visit('/') @@ -180,7 +180,7 @@ class EntityTest extends TestCase ->seeStatusCode(200); } - public function testEmptySearchRedirectsBack() + public function test_empty_search_redirects_back() { $this->asAdmin() ->visit('/') @@ -188,7 +188,7 @@ class EntityTest extends TestCase ->seePageIs('/'); } - public function testBookSearch() + public function test_book_search() { $book = \BookStack\Book::all()->first(); $page = $book->pages->last(); @@ -202,7 +202,7 @@ class EntityTest extends TestCase ->see($chapter->name); } - public function testEmptyBookSearchRedirectsBack() + public function test_empty_book_search_redirects_back() { $book = \BookStack\Book::all()->first(); $this->asAdmin() @@ -212,7 +212,7 @@ class EntityTest extends TestCase } - public function testEntitiesViewableAfterCreatorDeletion() + public function test_entities_viewable_after_creator_deletion() { // Create required assets and revisions $creator = $this->getNewUser(); @@ -225,7 +225,7 @@ class EntityTest extends TestCase $this->checkEntitiesViewable($entities); } - public function testEntitiesViewableAfterUpdaterDeletion() + public function test_entities_viewable_after_updater_deletion() { // Create required assets and revisions $creator = $this->getNewUser(); diff --git a/tests/PublicViewTest.php b/tests/PublicViewTest.php index b5141f0f6..58e39dfd9 100644 --- a/tests/PublicViewTest.php +++ b/tests/PublicViewTest.php @@ -3,7 +3,7 @@ class PublicViewTest extends TestCase { - public function testBooksViewable() + public function test_books_viewable() { $this->setSettings(['app-public' => 'true']); $books = \BookStack\Book::orderBy('name', 'asc')->take(10)->get(); @@ -13,14 +13,14 @@ class PublicViewTest extends TestCase $this->visit('/books') ->seeStatusCode(200) ->see($books[0]->name) - // Check indavidual book page is showing and it's child contents are visible. + // Check individual book page is showing and it's child contents are visible. ->click($bookToVisit->name) ->seePageIs($bookToVisit->getUrl()) ->see($bookToVisit->name) ->see($bookToVisit->chapters()->first()->name); } - public function testChaptersViewable() + public function test_chapters_viewable() { $this->setSettings(['app-public' => 'true']); $chapterToVisit = \BookStack\Chapter::first(); @@ -30,7 +30,7 @@ class PublicViewTest extends TestCase $this->visit($chapterToVisit->getUrl()) ->seeStatusCode(200) ->see($chapterToVisit->name) - // Check indavidual chapter page is showing and it's child contents are visible. + // Check individual chapter page is showing and it's child contents are visible. ->see($pageToVisit->name) ->click($pageToVisit->name) ->see($chapterToVisit->book->name) From bb87401d1064e7c792467b49cb49e809edd2087f Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 17 Jan 2016 15:19:26 +0000 Subject: [PATCH 08/11] Improved image upload error handling and fixed bad user-avatar rewriting --- app/Exceptions/ImageUploadException.php | 6 ++++++ app/Http/Controllers/ImageController.php | 9 ++++++++- resources/assets/js/directives.js | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 app/Exceptions/ImageUploadException.php diff --git a/app/Exceptions/ImageUploadException.php b/app/Exceptions/ImageUploadException.php new file mode 100644 index 000000000..205bdd4ff --- /dev/null +++ b/app/Exceptions/ImageUploadException.php @@ -0,0 +1,6 @@ +file('file'); - $image = $this->imageRepo->saveNew($imageUpload, $type); + + try { + $image = $this->imageRepo->saveNew($imageUpload, $type); + } catch (ImageUploadException $e) { + return response($e->getMessage(), 500); + } + return response()->json($image); } diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js index 758f16cd2..6ccfcf855 100644 --- a/resources/assets/js/directives.js +++ b/resources/assets/js/directives.js @@ -56,6 +56,7 @@ module.exports = function (ngApp) { var usingIds = typeof scope.currentId !== 'undefined' || scope.currentId === 'false'; scope.image = scope.currentImage; scope.value = scope.currentImage || ''; + if (usingIds) scope.value = scope.currentId; function setImage(imageModel, imageUrl) { scope.image = imageUrl; From 7bcd967fd9a6dc25be81fcccbe7f1d4df17a7b3e Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 17 Jan 2016 15:20:07 +0000 Subject: [PATCH 09/11] Increased LDAP testing and fixed any Auth-based bugs found --- .env.example | 3 + app/Http/Controllers/Auth/AuthController.php | 1 + app/Http/Controllers/UserController.php | 25 +++++-- app/Repos/UserRepo.php | 8 +++ app/Services/ImageService.php | 22 ++++-- app/Services/LdapService.php | 3 +- readme.md | 59 ++++++++++++++-- tests/Auth/LdapTest.php | 73 +++++++++++++++++++- 8 files changed, 172 insertions(+), 22 deletions(-) diff --git a/.env.example b/.env.example index d32d96c0d..6d706abdd 100644 --- a/.env.example +++ b/.env.example @@ -25,6 +25,9 @@ STORAGE_S3_BUCKET=false # Used to prefix image urls for when using custom domains/cdns STORAGE_URL=false +# General auth +AUTH_METHOD=standard + # Social Authentication information. Defaults as off. GITHUB_APP_ID=false GITHUB_APP_SECRET=false diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index d601b4985..fef87d5c8 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -191,6 +191,7 @@ class AuthController extends Controller } $newUser->email_confirmed = true; + auth()->login($newUser); session()->flash('success', 'Thanks for signing up! You are now registered and signed in.'); return redirect($this->redirectPath()); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index f504f4477..325d3118f 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -58,18 +58,31 @@ class UserController extends Controller public function store(Request $request) { $this->checkPermission('user-create'); - $this->validate($request, [ + $validationRules = [ 'name' => 'required', 'email' => 'required|email|unique:users,email', - 'password' => 'required|min:5', - 'password-confirm' => 'required|same:password', 'role' => 'required|exists:roles,id' - ]); + ]; + + $authMethod = config('auth.method'); + if ($authMethod === 'standard') { + $validationRules['password'] = 'required|min:5'; + $validationRules['password-confirm'] = 'required|same:password'; + } elseif ($authMethod === 'ldap') { + $validationRules['external_auth_id'] = 'required'; + } + $this->validate($request, $validationRules); + $user = $this->user->fill($request->all()); - $user->password = bcrypt($request->get('password')); - $user->save(); + if ($authMethod === 'standard') { + $user->password = bcrypt($request->get('password')); + } elseif ($authMethod === 'ldap') { + $user->external_auth_id = $request->get('external_auth_id'); + } + + $user->save(); $user->attachRoleId($request->get('role')); // Get avatar from gravatar and save diff --git a/app/Repos/UserRepo.php b/app/Repos/UserRepo.php index 77ad22f39..d02ffe929 100644 --- a/app/Repos/UserRepo.php +++ b/app/Repos/UserRepo.php @@ -48,6 +48,14 @@ class UserRepo { $user = $this->create($data); $this->attachDefaultRole($user); + + // Get avatar from gravatar and save + if (!config('services.disable_services')) { + $avatar = \Images::saveUserGravatar($user); + $user->avatar()->associate($avatar); + $user->save(); + } + return $user; } diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php index 600c85a24..0a4ef8849 100644 --- a/app/Services/ImageService.php +++ b/app/Services/ImageService.php @@ -1,5 +1,6 @@ put($fullPath, $imageData); - $userId = auth()->user()->id; - $image = Image::forceCreate([ + $imageDetails = [ 'name' => $imageName, 'path' => $fullPath, 'url' => $this->getPublicUrl($fullPath), - 'type' => $type, - 'created_by' => $userId, - 'updated_by' => $userId - ]); + 'type' => $type + ]; + + if (auth()->user() && auth()->user()->id !== 0) { + $userId = auth()->user()->id; + $imageDetails['created_by'] = $userId; + $imageDetails['updated_by'] = $userId; + } + + $image = Image::forceCreate($imageDetails); return $image; } @@ -188,6 +197,7 @@ class ImageService $imageName = str_replace(' ', '-', $user->name . '-gravatar.png'); $image = $this->saveNewFromUrl($url, 'user', $imageName); $image->created_by = $user->id; + $image->updated_by = $user->id; $image->save(); return $image; } diff --git a/app/Services/LdapService.php b/app/Services/LdapService.php index d33f8c378..84883b09a 100644 --- a/app/Services/LdapService.php +++ b/app/Services/LdapService.php @@ -36,6 +36,7 @@ class LdapService public function getUserDetails($userName) { $ldapConnection = $this->getConnection(); + $this->bindSystemUser($ldapConnection); // Find user $userFilter = $this->buildFilter($this->config['user_filter'], ['user' => $userName]); @@ -93,7 +94,7 @@ class LdapService $ldapBind = $this->ldap->bind($connection, $ldapDn, $ldapPass); } - if (!$ldapBind) throw new LdapException('LDAP access failed using ' . $isAnonymous ? ' anonymous bind.' : ' given dn & pass details'); + if (!$ldapBind) throw new LdapException('LDAP access failed using ' . ($isAnonymous ? ' anonymous bind.' : ' given dn & pass details')); } /** diff --git a/readme.md b/readme.md index 1a429369b..5483404b2 100644 --- a/readme.md +++ b/readme.md @@ -2,12 +2,24 @@ A platform to create documentation/wiki content. General information about BookStack can be found at https://www.bookstackapp.com/ +1. [Requirements](#requirements) +2. [Installation](#installation) + - [Server Rewrite Rules](#url-rewrite-rules) +3. [Updating](#updating-bookstack) +4. [Social Authentication](#social-authentication) + - [Google](#google) + - [GitHub](#github) +5. [LDAP Authentication](#ldap-authentication) +6. [Testing](#testing) +7. [License](#license) +8. [Attribution](#attribution) + ## Requirements BookStack has similar requirements to Laravel. On top of those are some front-end build tools which are only required when developing. -* PHP >= 5.5.9 +* PHP >= 5.5.9, Will need to be usable from the command line. * OpenSSL PHP Extension * PDO PHP Extension * MBstring PHP Extension @@ -21,9 +33,7 @@ BookStack has similar requirements to Laravel. On top of those are some front-en ## Installation -Ensure the requirements are met before installing. - -Currently BookStack requires its own domain/subdomain and will not work in a site subdirectory. +Ensure the above requirements are met before installing. Currently BookStack requires its own domain/subdomain and will not work in a site subdirectory. This project currently uses the `release` branch of this repository as a stable channel for providing updates. @@ -67,11 +77,11 @@ To update BookStack you can run the following command in the root directory of t ``` git pull origin release && composer install && php artisan migrate ``` -This command will update the repository that was created in the installation, install the PHP dependencies using `composer` then run the database migrations. +This command will update the repository that was created in the installation, install the PHP dependencies using `composer` then run the database migrations. ## Social Authentication -BookStack currently supports login via both Google and Github. Once enabled options for these services will show up in the login, registration and user profile pages. By default these services are disabled. To enable them you will have to create an application on the external services to obtain the require application id's and secrets. Here are instructions to do this for the current supported services: +BookStack currently supports login via both Google and GitHub. Once enabled options for these services will show up in the login, registration and user profile pages. By default these services are disabled. To enable them you will have to create an application on the external services to obtain the require application id's and secrets. Here are instructions to do this for the current supported services: ### Google @@ -97,6 +107,43 @@ BookStack currently supports login via both Google and Github. Once enabled opti 5. Set the 'APP_URL' environment variable to be the same domain as you entered in step 3. 6. All done! Users should now be able to link to their social accounts in their account profile pages and also register/login using their Github account. +## LDAP Authentication + +BookStack can be configured to allow LDAP based user login. While LDAP login is enabled you cannot log in with the standard user/password login and new user registration is disabled. BookStack will only use the LDAP server for getting user details and for authentication. Data on the LDAP server is not currently editable through BookStack. + +When a LDAP user logs into BookStack for the first time their BookStack profile will be created and they will be given the default role set under the 'Default user role after registration' option in the application settings. + +To set up LDAP-based authentication add or modify the following variables in your `.env` file: + +``` +# General auth +AUTH_METHOD=ldap + +# The LDAP host, Adding a port is optional +LDAP_SERVER=ldap://example.com:389 + +# The base DN from where users will be searched within. +LDAP_BASE_DN=ou=People,dc=example,dc=com + +# The full DN and password of the user used to search the server +# Can both be left as false to bind anonymously +LDAP_DN=false +LDAP_PASS=false + +# A filter to use when searching for users +# The user-provided user-name used to replace any occurrences of '${user}' +LDAP_USER_FILTER=(&(uid=${user})) + +# Set the LDAP version to use when connecting to the server. +LDAP_VERSION=false +``` + +You will also need to have the php-ldap extension installed on your system. It's recommended to change your `APP_DEBUG` variable to `true` while setting up LDAP to make any errors visible. Remember to change this back after LDAP is functioning. + +A user in BookStack will be linked to a LDAP user via a 'uid'. If a LDAP user uid changes it can be updated in BookStack by an admin by changing the 'External Authentication ID' field on the user's profile. + +You may find that you cannot log in with your initial Admin account after changing the `AUTH_METHOD` to `ldap`. To get around this set the `AUTH_METHOD` to `standard`, login with your admin account then change it back to `ldap`. You get then edit your profile and add your LDAP uid under the 'External Authentication ID' field. You will then be able to login in with that ID. + ## Testing BookStack has many integration tests that use Laravel's built-in testing capabilities which makes use of PHPUnit. To use you will need PHPUnit installed and accessible via command line. There is a `mysql_testing` database defined within the app config which is what is used by PHPUnit. This database is set with the following database name, user name and password defined as `bookstack-test`. You will have to create that database and credentials before testing. diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php index 6b026dab9..14f2f8196 100644 --- a/tests/Auth/LdapTest.php +++ b/tests/Auth/LdapTest.php @@ -19,18 +19,18 @@ class LdapTest extends \TestCase $this->mockUser = factory(User::class)->make(); } - public function test_ldap_login() + public function test_login() { $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId); $this->mockLdap->shouldReceive('setOption')->once(); - $this->mockLdap->shouldReceive('searchAndGetEntries')->twice() + $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4) ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array')) ->andReturn(['count' => 1, 0 => [ 'uid' => [$this->mockUser->name], 'cn' => [$this->mockUser->name], 'dn' => ['dc=test'.config('services.ldap.base_dn')] ]]); - $this->mockLdap->shouldReceive('bind')->times(1)->andReturn(true); + $this->mockLdap->shouldReceive('bind')->times(6)->andReturn(true); $this->visit('/login') ->see('Username') @@ -38,6 +38,73 @@ class LdapTest extends \TestCase ->type($this->mockUser->password, '#password') ->press('Sign In') ->seePageIs('/login')->see('Please enter an email to use for this account.'); + + $this->type($this->mockUser->email, '#email') + ->press('Sign In') + ->seePageIs('/') + ->see($this->mockUser->name) + ->seeInDatabase('users', ['email' => $this->mockUser->email, 'email_confirmed' => 1, 'external_auth_id' => $this->mockUser->name]); + } + + public function test_initial_incorrect_details() + { + $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId); + $this->mockLdap->shouldReceive('setOption')->once(); + $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2) + ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array')) + ->andReturn(['count' => 1, 0 => [ + 'uid' => [$this->mockUser->name], + 'cn' => [$this->mockUser->name], + 'dn' => ['dc=test'.config('services.ldap.base_dn')] + ]]); + $this->mockLdap->shouldReceive('bind')->times(3)->andReturn(true, true, false); + + $this->visit('/login') + ->see('Username') + ->type($this->mockUser->name, '#username') + ->type($this->mockUser->password, '#password') + ->press('Sign In') + ->seePageIs('/login')->see('These credentials do not match our records.') + ->dontSeeInDatabase('users', ['external_auth_id' => $this->mockUser->name]); + } + + public function test_create_user_form() + { + $this->asAdmin()->visit('/users/create') + ->dontSee('Password') + ->type($this->mockUser->name, '#name') + ->type($this->mockUser->email, '#email') + ->press('Save') + ->see('The external auth id field is required.') + ->type($this->mockUser->name, '#external_auth_id') + ->press('Save') + ->seePageIs('/users') + ->seeInDatabase('users', ['email' => $this->mockUser->email, 'external_auth_id' => $this->mockUser->name, 'email_confirmed' => true]); + } + + public function test_user_edit_form() + { + $editUser = User::all()->last(); + $this->asAdmin()->visit('/users/' . $editUser->id) + ->see('Edit User') + ->dontSee('Password') + ->type('test_auth_id', '#external_auth_id') + ->press('Save') + ->seePageIs('/users') + ->seeInDatabase('users', ['email' => $editUser->email, 'external_auth_id' => 'test_auth_id']); + } + + public function test_registration_disabled() + { + $this->visit('/register') + ->seePageIs('/login'); + } + + public function test_non_admins_cannot_change_auth_id() + { + $testUser = User::all()->last(); + $this->actingAs($testUser)->visit('/users/' . $testUser->id) + ->dontSee('External Authentication'); } } \ No newline at end of file From ea2e16cabb5ca5815dd1ee5b8eb1ac6a32bac57e Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Wed, 20 Jan 2016 22:13:13 +0000 Subject: [PATCH 10/11] Added page HTML export --- app/Http/Controllers/PageController.php | 38 ++++++++- app/Http/routes.php | 5 +- app/Services/ExportService.php | 61 +++++++++++++++ composer.lock | 32 ++++---- gulpfile.js | 1 + resources/assets/sass/_fonts.scss | 96 +++++++++++++++++++++++ resources/assets/sass/_header.scss | 2 +- resources/assets/sass/_variables.scss | 98 ------------------------ resources/assets/sass/export-styles.scss | 12 +++ resources/assets/sass/styles.scss | 1 + resources/views/pages/pdf.blade.php | 32 ++++++++ resources/views/pages/show.blade.php | 6 ++ 12 files changed, 263 insertions(+), 121 deletions(-) create mode 100644 app/Services/ExportService.php create mode 100644 resources/assets/sass/_fonts.scss create mode 100644 resources/assets/sass/export-styles.scss create mode 100644 resources/views/pages/pdf.blade.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 499796314..970d0dc03 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -3,6 +3,7 @@ namespace BookStack\Http\Controllers; use Activity; +use BookStack\Services\ExportService; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -18,18 +19,21 @@ class PageController extends Controller protected $pageRepo; protected $bookRepo; protected $chapterRepo; + protected $exportService; /** * PageController constructor. - * @param PageRepo $pageRepo - * @param BookRepo $bookRepo - * @param ChapterRepo $chapterRepo + * @param PageRepo $pageRepo + * @param BookRepo $bookRepo + * @param ChapterRepo $chapterRepo + * @param ExportService $exportService */ - public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo) + public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ExportService $exportService) { $this->pageRepo = $pageRepo; $this->bookRepo = $bookRepo; $this->chapterRepo = $chapterRepo; + $this->exportService = $exportService; parent::__construct(); } @@ -221,4 +225,30 @@ class PageController extends Controller Activity::add($page, 'page_restore', $book->id); return redirect($page->getUrl()); } + + public function exportPdf($bookSlug, $pageSlug) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $cssContent = file_get_contents(public_path('/css/styles.css')); + + return $pdf->download($pageSlug . '.pdf'); + } + + /** + * Export a page to a self-contained HTML file. + * @param $bookSlug + * @param $pageSlug + * @return \Illuminate\Http\Response + */ + public function exportHtml($bookSlug, $pageSlug) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $containedHtml = $this->exportService->pageToContainedHtml($page); + return response()->make($containedHtml, 200, [ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.html' + ]); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 23d4c33ab..7c6a256a5 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -18,17 +18,18 @@ Route::group(['middleware' => 'auth'], function () { Route::get('/{bookSlug}/sort', 'BookController@sort'); Route::put('/{bookSlug}/sort', 'BookController@saveSort'); - // Pages Route::get('/{bookSlug}/page/create', 'PageController@create'); Route::post('/{bookSlug}/page', 'PageController@store'); Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show'); + Route::get('/{bookSlug}/page/{pageSlug}/export/pdf', 'PageController@exportPdf'); + Route::get('/{bookSlug}/page/{pageSlug}/export/html', 'PageController@exportHtml'); Route::get('/{bookSlug}/page/{pageSlug}/edit', 'PageController@edit'); Route::get('/{bookSlug}/page/{pageSlug}/delete', 'PageController@showDelete'); Route::put('/{bookSlug}/page/{pageSlug}', 'PageController@update'); Route::delete('/{bookSlug}/page/{pageSlug}', 'PageController@destroy'); - //Revisions + // Revisions Route::get('/{bookSlug}/page/{pageSlug}/revisions', 'PageController@showRevisions'); Route::get('/{bookSlug}/page/{pageSlug}/revisions/{revId}', 'PageController@showRevision'); Route::get('/{bookSlug}/page/{pageSlug}/revisions/{revId}/restore', 'PageController@restoreRevision'); diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php new file mode 100644 index 000000000..05ba85dd1 --- /dev/null +++ b/app/Services/ExportService.php @@ -0,0 +1,61 @@ + $page, 'css' => $cssContent])->render(); + + $imageTagsOutput = []; + preg_match_all("/\/i", $pageHtml, $imageTagsOutput); + + // Replace image src with base64 encoded image strings + if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) { + foreach ($imageTagsOutput[0] as $index => $imgMatch) { + $oldImgString = $imgMatch; + $srcString = $imageTagsOutput[2][$index]; + if (strpos(trim($srcString), 'http') !== 0) { + $pathString = public_path($srcString); + } else { + $pathString = $srcString; + } + $imageContent = file_get_contents($pathString); + $imageEncoded = 'data:image/' . pathinfo($pathString, PATHINFO_EXTENSION) . ';base64,' . base64_encode($imageContent); + $newImageString = str_replace($srcString, $imageEncoded, $oldImgString); + $pageHtml = str_replace($oldImgString, $newImageString, $pageHtml); + } + } + + $linksOutput = []; + preg_match_all("/\/i", $pageHtml, $linksOutput); + + // Replace image src with base64 encoded image strings + if (isset($linksOutput[0]) && count($linksOutput[0]) > 0) { + foreach ($linksOutput[0] as $index => $linkMatch) { + $oldLinkString = $linkMatch; + $srcString = $linksOutput[2][$index]; + if (strpos(trim($srcString), 'http') !== 0) { + $newSrcString = url($srcString); + $newLinkString = str_replace($srcString, $newSrcString, $oldLinkString); + $pageHtml = str_replace($oldLinkString, $newLinkString, $pageHtml); + } + } + } + + // Replace any relative links with system domain + return $pageHtml; + } + +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index 364e7092e..d64c48e29 100644 --- a/composer.lock +++ b/composer.lock @@ -9,16 +9,16 @@ "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.12.1", + "version": "3.13.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "5ee0f33fafe47740c03ff38ddb73ae4f52b4da5b" + "reference": "cc1796d1c21146cdcbfb7628aee816acb7b85e09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5ee0f33fafe47740c03ff38ddb73ae4f52b4da5b", - "reference": "5ee0f33fafe47740c03ff38ddb73ae4f52b4da5b", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc1796d1c21146cdcbfb7628aee816acb7b85e09", + "reference": "cc1796d1c21146cdcbfb7628aee816acb7b85e09", "shasum": "" }, "require": { @@ -40,7 +40,7 @@ "ext-simplexml": "*", "ext-spl": "*", "nette/neon": "^2.3", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0|~5.0" }, "suggest": { "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2016-01-06 22:50:48" + "time": "2016-01-19 22:46:22" }, { "name": "barryvdh/laravel-debugbar", @@ -829,16 +829,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.7", + "version": "v5.2.10", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "26cd65eaa4bcc0fb0be381cfb7cfdcda06a3c2b4" + "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/26cd65eaa4bcc0fb0be381cfb7cfdcda06a3c2b4", - "reference": "26cd65eaa4bcc0fb0be381cfb7cfdcda06a3c2b4", + "url": "https://api.github.com/repos/laravel/framework/zipball/93dc5b0089eef468157fd7200e575c3861ec59a5", + "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5", "shasum": "" }, "require": { @@ -953,7 +953,7 @@ "framework", "laravel" ], - "time": "2016-01-07 13:54:34" + "time": "2016-01-13 20:29:10" }, { "name": "laravel/socialite", @@ -1849,16 +1849,16 @@ }, { "name": "symfony/class-loader", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "ec74b0a279cf3a9bd36172b3e3061591d380ce6c" + "reference": "98e9089a428ed0e39423b67352c57ef5910a3269" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/ec74b0a279cf3a9bd36172b3e3061591d380ce6c", - "reference": "ec74b0a279cf3a9bd36172b3e3061591d380ce6c", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/98e9089a428ed0e39423b67352c57ef5910a3269", + "reference": "98e9089a428ed0e39423b67352c57ef5910a3269", "shasum": "" }, "require": { @@ -1897,7 +1897,7 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2015-12-05 17:37:59" + "time": "2016-01-03 15:33:41" }, { "name": "symfony/console", diff --git a/gulpfile.js b/gulpfile.js index e60dffc70..7deefc71a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -21,6 +21,7 @@ elixir.extend('queryVersion', function(inputFiles) { elixir(function(mix) { mix.sass('styles.scss') .sass('print-styles.scss') + .sass('export-styles.scss') .browserify('global.js', 'public/js/common.js') .queryVersion(['css/styles.css', 'css/print-styles.css', 'js/common.js']); }); diff --git a/resources/assets/sass/_fonts.scss b/resources/assets/sass/_fonts.scss new file mode 100644 index 000000000..0dc8c95b2 --- /dev/null +++ b/resources/assets/sass/_fonts.scss @@ -0,0 +1,96 @@ +/* Generated by Font Squirrel (http://www.fontsquirrel.com) on December 30, 2015 */ +@font-face { + font-family: 'Roboto'; + src: url('/fonts/roboto-bold-webfont.eot'); + src: url('/fonts/roboto-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto-bold-webfont.woff2') format('woff2'), + url('/fonts/roboto-bold-webfont.woff') format('woff'), + url('/fonts/roboto-bold-webfont.ttf') format('truetype'), + url('/fonts/roboto-bold-webfont.svg#robotobold') format('svg'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Roboto'; + src: url('/fonts/roboto-bolditalic-webfont.eot'); + src: url('/fonts/roboto-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto-bolditalic-webfont.woff2') format('woff2'), + url('/fonts/roboto-bolditalic-webfont.woff') format('woff'), + url('/fonts/roboto-bolditalic-webfont.ttf') format('truetype'), + url('/fonts/roboto-bolditalic-webfont.svg#robotobold_italic') format('svg'); + font-weight: bold; + font-style: italic; +} + +@font-face { + font-family: 'Roboto'; + src: url('/fonts/roboto-italic-webfont.eot'); + src: url('/fonts/roboto-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto-italic-webfont.woff2') format('woff2'), + url('/fonts/roboto-italic-webfont.woff') format('woff'), + url('/fonts/roboto-italic-webfont.ttf') format('truetype'), + url('/fonts/roboto-italic-webfont.svg#robotoitalic') format('svg'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Roboto'; + src: url('/fonts/roboto-light-webfont.eot'); + src: url('/fonts/roboto-light-webfont.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto-light-webfont.woff2') format('woff2'), + url('/fonts/roboto-light-webfont.woff') format('woff'), + url('/fonts/roboto-light-webfont.ttf') format('truetype'), + url('/fonts/roboto-light-webfont.svg#robotolight') format('svg'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'Roboto'; + src: url('/fonts/roboto-lightitalic-webfont.eot'); + src: url('/fonts/roboto-lightitalic-webfont.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto-lightitalic-webfont.woff2') format('woff2'), + url('/fonts/roboto-lightitalic-webfont.woff') format('woff'), + url('/fonts/roboto-lightitalic-webfont.ttf') format('truetype'), + url('/fonts/roboto-lightitalic-webfont.svg#robotolight_italic') format('svg'); + font-weight: 300; + font-style: italic; +} + +@font-face { + font-family: 'Roboto'; + src: url('/fonts/roboto-medium-webfont.eot'); + src: url('/fonts/roboto-medium-webfont.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto-medium-webfont.woff2') format('woff2'), + url('/fonts/roboto-medium-webfont.woff') format('woff'), + url('/fonts/roboto-medium-webfont.ttf') format('truetype'), + url('/fonts/roboto-medium-webfont.svg#robotomedium') format('svg'); + font-weight: 500; + font-style: normal; +} + +@font-face { + font-family: 'Roboto'; + src: url('/fonts/roboto-mediumitalic-webfont.eot'); + src: url('/fonts/roboto-mediumitalic-webfont.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto-mediumitalic-webfont.woff2') format('woff2'), + url('/fonts/roboto-mediumitalic-webfont.woff') format('woff'), + url('/fonts/roboto-mediumitalic-webfont.ttf') format('truetype'), + url('/fonts/roboto-mediumitalic-webfont.svg#robotomedium_italic') format('svg'); + font-weight: 500; + font-style: italic; +} + +@font-face { + font-family: 'Roboto'; + src: url('/fonts/roboto-regular-webfont.eot'); + src: url('/fonts/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('/fonts/roboto-regular-webfont.woff2') format('woff2'), + url('/fonts/roboto-regular-webfont.woff') format('woff'), + url('/fonts/roboto-regular-webfont.ttf') format('truetype'), + url('/fonts/roboto-regular-webfont.svg#robotoregular') format('svg'); + font-weight: normal; + font-style: normal; +} \ No newline at end of file diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss index 2035a1822..22c9994d4 100644 --- a/resources/assets/sass/_header.scss +++ b/resources/assets/sass/_header.scss @@ -187,7 +187,7 @@ form.search-box { } .faded { - a, button, span { + a, button, span, span > div { color: #666; } .text-button { diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index c02488d86..29a46302b 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -52,101 +52,3 @@ $text-light: #EEE; $bs-light: 0 0 4px 1px #CCC; $bs-med: 0 1px 3px 1px rgba(76, 76, 76, 0.26); $bs-hover: 0 2px 2px 1px rgba(0,0,0,.13); - - -/* Generated by Font Squirrel (http://www.fontsquirrel.com) on December 30, 2015 */ -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-bold-webfont.eot'); - src: url('/fonts/roboto-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-bold-webfont.woff2') format('woff2'), - url('/fonts/roboto-bold-webfont.woff') format('woff'), - url('/fonts/roboto-bold-webfont.ttf') format('truetype'), - url('/fonts/roboto-bold-webfont.svg#robotobold') format('svg'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-bolditalic-webfont.eot'); - src: url('/fonts/roboto-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-bolditalic-webfont.woff2') format('woff2'), - url('/fonts/roboto-bolditalic-webfont.woff') format('woff'), - url('/fonts/roboto-bolditalic-webfont.ttf') format('truetype'), - url('/fonts/roboto-bolditalic-webfont.svg#robotobold_italic') format('svg'); - font-weight: bold; - font-style: italic; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-italic-webfont.eot'); - src: url('/fonts/roboto-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-italic-webfont.woff2') format('woff2'), - url('/fonts/roboto-italic-webfont.woff') format('woff'), - url('/fonts/roboto-italic-webfont.ttf') format('truetype'), - url('/fonts/roboto-italic-webfont.svg#robotoitalic') format('svg'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-light-webfont.eot'); - src: url('/fonts/roboto-light-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-light-webfont.woff2') format('woff2'), - url('/fonts/roboto-light-webfont.woff') format('woff'), - url('/fonts/roboto-light-webfont.ttf') format('truetype'), - url('/fonts/roboto-light-webfont.svg#robotolight') format('svg'); - font-weight: 300; - font-style: normal; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-lightitalic-webfont.eot'); - src: url('/fonts/roboto-lightitalic-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-lightitalic-webfont.woff2') format('woff2'), - url('/fonts/roboto-lightitalic-webfont.woff') format('woff'), - url('/fonts/roboto-lightitalic-webfont.ttf') format('truetype'), - url('/fonts/roboto-lightitalic-webfont.svg#robotolight_italic') format('svg'); - font-weight: 300; - font-style: italic; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-medium-webfont.eot'); - src: url('/fonts/roboto-medium-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-medium-webfont.woff2') format('woff2'), - url('/fonts/roboto-medium-webfont.woff') format('woff'), - url('/fonts/roboto-medium-webfont.ttf') format('truetype'), - url('/fonts/roboto-medium-webfont.svg#robotomedium') format('svg'); - font-weight: 500; - font-style: normal; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-mediumitalic-webfont.eot'); - src: url('/fonts/roboto-mediumitalic-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-mediumitalic-webfont.woff2') format('woff2'), - url('/fonts/roboto-mediumitalic-webfont.woff') format('woff'), - url('/fonts/roboto-mediumitalic-webfont.ttf') format('truetype'), - url('/fonts/roboto-mediumitalic-webfont.svg#robotomedium_italic') format('svg'); - font-weight: 500; - font-style: italic; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-regular-webfont.eot'); - src: url('/fonts/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-regular-webfont.woff2') format('woff2'), - url('/fonts/roboto-regular-webfont.woff') format('woff'), - url('/fonts/roboto-regular-webfont.ttf') format('truetype'), - url('/fonts/roboto-regular-webfont.svg#robotoregular') format('svg'); - font-weight: normal; - font-style: normal; -} diff --git a/resources/assets/sass/export-styles.scss b/resources/assets/sass/export-styles.scss new file mode 100644 index 000000000..31a89b4ce --- /dev/null +++ b/resources/assets/sass/export-styles.scss @@ -0,0 +1,12 @@ +@import "reset"; +@import "variables"; +@import "mixins"; +@import "html"; +@import "text"; +@import "grid"; +@import "blocks"; +@import "forms"; +@import "tables"; +@import "header"; +@import "lists"; +@import "pages"; \ No newline at end of file diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss index 710bee7ee..c419c08b6 100644 --- a/resources/assets/sass/styles.scss +++ b/resources/assets/sass/styles.scss @@ -1,5 +1,6 @@ @import "reset"; @import "variables"; +@import "fonts"; @import "mixins"; @import "html"; @import "text"; diff --git a/resources/views/pages/pdf.blade.php b/resources/views/pages/pdf.blade.php new file mode 100644 index 000000000..73cf131bc --- /dev/null +++ b/resources/views/pages/pdf.blade.php @@ -0,0 +1,32 @@ + + + + + {{ $page->name }} + + + + +
    +
    +
    +
    + + @include('pages/page-display') + +
    + +

    + Created {{$page->created_at->diffForHumans()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif +
    + Last Updated {{$page->updated_at->diffForHumans()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif +

    + +
    +
    +
    +
    + + diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 612ccdba6..f2ce6fb07 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -19,6 +19,12 @@
+ +
Export Page
+ + @if($currentUser->can('page-update')) Revisions Edit From 080acf0a6234952b4eac1df59e9c11d3be04074b Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 31 Jan 2016 17:53:30 +0000 Subject: [PATCH 11/11] Added plaintext & basic PDF page Export --- app/Http/Controllers/PageController.php | 33 ++- app/Http/routes.php | 2 +- app/Services/ExportService.php | 70 +++++- composer.json | 3 +- composer.lock | 215 ++++++++++++++---- config/app.php | 2 + config/dompdf.php | 266 +++++++++++++++++++++++ resources/assets/sass/_header.scss | 6 + resources/assets/sass/_variables.scss | 4 +- resources/assets/sass/export-styles.scss | 2 +- resources/views/pages/export.blade.php | 33 +++ resources/views/pages/pdf.blade.php | 50 ++--- resources/views/pages/show.blade.php | 8 +- storage/fonts/.gitignore | 2 + 14 files changed, 602 insertions(+), 94 deletions(-) create mode 100644 config/dompdf.php create mode 100644 resources/views/pages/export.blade.php create mode 100644 storage/fonts/.gitignore diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 970d0dc03..b4ab9682b 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -226,13 +226,22 @@ class PageController extends Controller return redirect($page->getUrl()); } + /** + * Exports a page to pdf format using barryvdh/laravel-dompdf wrapper. + * https://github.com/barryvdh/laravel-dompdf + * @param $bookSlug + * @param $pageSlug + * @return \Illuminate\Http\Response + */ public function exportPdf($bookSlug, $pageSlug) { $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); - $cssContent = file_get_contents(public_path('/css/styles.css')); - - return $pdf->download($pageSlug . '.pdf'); + $pdfContent = $this->exportService->pageToPdf($page); + return response()->make($pdfContent, 200, [ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.pdf' + ]); } /** @@ -251,4 +260,22 @@ class PageController extends Controller 'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.html' ]); } + + /** + * Export a page to a simple plaintext .txt file. + * @param $bookSlug + * @param $pageSlug + * @return \Illuminate\Http\Response + */ + public function exportPlainText($bookSlug, $pageSlug) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $containedHtml = $this->exportService->pageToPlainText($page); + return response()->make($containedHtml, 200, [ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.txt' + ]); + } + } diff --git a/app/Http/routes.php b/app/Http/routes.php index 7c6a256a5..6ac322122 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -24,6 +24,7 @@ Route::group(['middleware' => 'auth'], function () { Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show'); Route::get('/{bookSlug}/page/{pageSlug}/export/pdf', 'PageController@exportPdf'); Route::get('/{bookSlug}/page/{pageSlug}/export/html', 'PageController@exportHtml'); + 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::put('/{bookSlug}/page/{pageSlug}', 'PageController@update'); @@ -46,7 +47,6 @@ Route::group(['middleware' => 'auth'], function () { }); - // Users Route::get('/users', 'UserController@index'); Route::get('/users/create', 'UserController@create'); diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php index 05ba85dd1..0497681e9 100644 --- a/app/Services/ExportService.php +++ b/app/Services/ExportService.php @@ -6,7 +6,6 @@ use BookStack\Page; class ExportService { - /** * Convert a page to a self-contained HTML file. * Includes required CSS & image content. Images are base64 encoded into the HTML. @@ -16,10 +15,33 @@ class ExportService public function pageToContainedHtml(Page $page) { $cssContent = file_get_contents(public_path('/css/export-styles.css')); - $pageHtml = view('pages/pdf', ['page' => $page, 'css' => $cssContent])->render(); + $pageHtml = view('pages/export', ['page' => $page, 'css' => $cssContent])->render(); + return $this->containHtml($pageHtml); + } + /** + * Convert a page to a pdf file. + * @param Page $page + * @return mixed|string + */ + public function pageToPdf(Page $page) + { + $cssContent = file_get_contents(public_path('/css/export-styles.css')); + $pageHtml = view('pages/pdf', ['page' => $page, 'css' => $cssContent])->render(); + $containedHtml = $this->containHtml($pageHtml); + $pdf = \PDF::loadHTML($containedHtml); + return $pdf->output(); + } + + /** + * Bundle of the contents of a html file to be self-contained. + * @param $htmlContent + * @return mixed|string + */ + protected function containHtml($htmlContent) + { $imageTagsOutput = []; - preg_match_all("/\/i", $pageHtml, $imageTagsOutput); + preg_match_all("/\/i", $htmlContent, $imageTagsOutput); // Replace image src with base64 encoded image strings if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) { @@ -34,12 +56,12 @@ class ExportService $imageContent = file_get_contents($pathString); $imageEncoded = 'data:image/' . pathinfo($pathString, PATHINFO_EXTENSION) . ';base64,' . base64_encode($imageContent); $newImageString = str_replace($srcString, $imageEncoded, $oldImgString); - $pageHtml = str_replace($oldImgString, $newImageString, $pageHtml); + $htmlContent = str_replace($oldImgString, $newImageString, $htmlContent); } } $linksOutput = []; - preg_match_all("/\/i", $pageHtml, $linksOutput); + preg_match_all("/\/i", $htmlContent, $linksOutput); // Replace image src with base64 encoded image strings if (isset($linksOutput[0]) && count($linksOutput[0]) > 0) { @@ -49,13 +71,45 @@ class ExportService if (strpos(trim($srcString), 'http') !== 0) { $newSrcString = url($srcString); $newLinkString = str_replace($srcString, $newSrcString, $oldLinkString); - $pageHtml = str_replace($oldLinkString, $newLinkString, $pageHtml); + $htmlContent = str_replace($oldLinkString, $newLinkString, $htmlContent); } } } // Replace any relative links with system domain - return $pageHtml; + return $htmlContent; } -} \ No newline at end of file + /** + * Converts the page contents into simple plain text. + * This method filters any bad looking content to + * provide a nice final output. + * @param Page $page + * @return mixed + */ + public function pageToPlainText(Page $page) + { + $text = $page->text; + // Replace multiple spaces with single spaces + $text = preg_replace('/\ {2,}/', ' ', $text); + // Reduce multiple horrid whitespace characters. + $text = preg_replace('/(\x0A|\xA0|\x0A|\r|\n){2,}/su', "\n\n", $text); + $text = html_entity_decode($text); + // Add title + $text = $page->name . "\n\n" . $text; + return $text; + } + +} + + + + + + + + + + + + diff --git a/composer.json b/composer.json index 0f6cec080..4a4c554a7 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ "laravel/socialite": "^2.0", "barryvdh/laravel-ide-helper": "^2.1", "barryvdh/laravel-debugbar": "^2.0", - "league/flysystem-aws-s3-v3": "^1.0" + "league/flysystem-aws-s3-v3": "^1.0", + "barryvdh/laravel-dompdf": "0.6.*" }, "require-dev": { "fzaninotto/faker": "~1.4", diff --git a/composer.lock b/composer.lock index d64c48e29..ad399b973 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "1ca2bc3308d193a556124513e1f57106", - "content-hash": "99d01bead4e1ead29f826cd7eae234ea", + "hash": "523e654de96df9259fa5dfcb583d6e3e", + "content-hash": "74b5601c253aab71cf55e0885f31ae7f", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.13.1", + "version": "3.14.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "cc1796d1c21146cdcbfb7628aee816acb7b85e09" + "reference": "2970cb63e7b7b37dd8c07a4fa4e4e18a110ed4e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc1796d1c21146cdcbfb7628aee816acb7b85e09", - "reference": "cc1796d1c21146cdcbfb7628aee816acb7b85e09", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2970cb63e7b7b37dd8c07a4fa4e4e18a110ed4e2", + "reference": "2970cb63e7b7b37dd8c07a4fa4e4e18a110ed4e2", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2016-01-19 22:46:22" + "time": "2016-01-28 21:33:18" }, { "name": "barryvdh/laravel-debugbar", @@ -140,6 +140,54 @@ ], "time": "2015-12-22 06:22:38" }, + { + "name": "barryvdh/laravel-dompdf", + "version": "v0.6.1", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-dompdf.git", + "reference": "b606788108833f7765801dca35455fb23ce9f869" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/b606788108833f7765801dca35455fb23ce9f869", + "reference": "b606788108833f7765801dca35455fb23ce9f869", + "shasum": "" + }, + "require": { + "dompdf/dompdf": "0.6.*", + "illuminate/support": "5.0.x|5.1.x|5.2.x", + "php": ">=5.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.6-dev" + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\DomPDF\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "A DOMPDF Wrapper for Laravel", + "keywords": [ + "dompdf", + "laravel", + "pdf" + ], + "time": "2015-12-21 19:51:22" + }, { "name": "barryvdh/laravel-ide-helper", "version": "v2.1.2", @@ -357,6 +405,47 @@ ], "time": "2015-11-06 14:35:42" }, + { + "name": "dompdf/dompdf", + "version": "v0.6.2", + "source": { + "type": "git", + "url": "https://github.com/dompdf/dompdf.git", + "reference": "cc06008f75262510ee135b8cbb14e333a309f651" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/cc06008f75262510ee135b8cbb14e333a309f651", + "reference": "cc06008f75262510ee135b8cbb14e333a309f651", + "shasum": "" + }, + "require": { + "phenx/php-font-lib": "0.2.*" + }, + "type": "library", + "autoload": { + "classmap": [ + "include/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + }, + { + "name": "Brian Sweeney", + "email": "eclecticgeek@gmail.com" + } + ], + "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", + "homepage": "https://github.com/dompdf/dompdf", + "time": "2015-12-07 04:07:13" + }, { "name": "guzzle/guzzle", "version": "v3.8.1", @@ -564,16 +653,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982" + "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/4d0bdbe1206df7440219ce14c972aa57cc5e4982", - "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb", + "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb", "shasum": "" }, "require": { @@ -618,7 +707,7 @@ "stream", "uri" ], - "time": "2015-11-03 01:34:55" + "time": "2016-01-23 01:23:02" }, { "name": "intervention/image", @@ -829,16 +918,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.10", + "version": "v5.2.12", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5" + "reference": "6b6255ad7bfbdb721b8d00b09d52b146c5d363d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/93dc5b0089eef468157fd7200e575c3861ec59a5", - "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5", + "url": "https://api.github.com/repos/laravel/framework/zipball/6b6255ad7bfbdb721b8d00b09d52b146c5d363d7", + "reference": "6b6255ad7bfbdb721b8d00b09d52b146c5d363d7", "shasum": "" }, "require": { @@ -953,7 +1042,7 @@ "framework", "laravel" ], - "time": "2016-01-13 20:29:10" + "time": "2016-01-26 04:15:37" }, { "name": "laravel/socialite", @@ -1343,23 +1432,23 @@ }, { "name": "mtdowling/cron-expression", - "version": "v1.0.4", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/mtdowling/cron-expression.git", - "reference": "fd92e883195e5dfa77720b1868cf084b08be4412" + "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/fd92e883195e5dfa77720b1868cf084b08be4412", - "reference": "fd92e883195e5dfa77720b1868cf084b08be4412", + "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5", + "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5", "shasum": "" }, "require": { "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "~4.0|~5.0" }, "type": "library", "autoload": { @@ -1383,7 +1472,7 @@ "cron", "schedule" ], - "time": "2015-01-11 23:07:46" + "time": "2016-01-26 21:23:30" }, { "name": "mtdowling/jmespath.php", @@ -1540,16 +1629,16 @@ }, { "name": "paragonie/random_compat", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7" + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", - "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/e6f80ab77885151908d0ec743689ca700886e8b0", + "reference": "e6f80ab77885151908d0ec743689ca700886e8b0", "shasum": "" }, "require": { @@ -1584,7 +1673,41 @@ "pseudorandom", "random" ], - "time": "2016-01-06 13:31:20" + "time": "2016-01-29 16:19:52" + }, + { + "name": "phenx/php-font-lib", + "version": "0.2.2", + "source": { + "type": "git", + "url": "https://github.com/PhenX/php-font-lib.git", + "reference": "c30c7fc00a6b0d863e9bb4c5d5dd015298b2dc82" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/c30c7fc00a6b0d863e9bb4c5d5dd015298b2dc82", + "reference": "c30c7fc00a6b0d863e9bb4c5d5dd015298b2dc82", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "classes/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + } + ], + "description": "A library to read, parse, export and make subsets of different types of font files.", + "homepage": "https://github.com/PhenX/php-font-lib", + "time": "2014-02-01 15:22:28" }, { "name": "phpdocumentor/reflection-docblock", @@ -2261,16 +2384,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" + "reference": "1289d16209491b584839022f29257ad859b8532d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", - "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", "shasum": "" }, "require": { @@ -2282,7 +2405,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2316,20 +2439,20 @@ "portable", "shim" ], - "time": "2015-11-20 09:19:13" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php56", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" + "reference": "4d891fff050101a53a4caabb03277284942d1ad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", - "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", + "reference": "4d891fff050101a53a4caabb03277284942d1ad9", "shasum": "" }, "require": { @@ -2339,7 +2462,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2372,20 +2495,20 @@ "portable", "shim" ], - "time": "2015-12-18 15:10:25" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-util", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969" + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969", - "reference": "4271c55cbc0a77b2641f861b978123e46b3da969", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", "shasum": "" }, "require": { @@ -2394,7 +2517,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2424,7 +2547,7 @@ "polyfill", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2016-01-20 09:13:37" }, { "name": "symfony/process", diff --git a/config/app.php b/config/app.php index 65bafefc6..650ad1d07 100644 --- a/config/app.php +++ b/config/app.php @@ -143,6 +143,7 @@ return [ * Third Party */ Intervention\Image\ImageServiceProvider::class, + Barryvdh\DomPDF\ServiceProvider::class, Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, Barryvdh\Debugbar\ServiceProvider::class, @@ -210,6 +211,7 @@ return [ */ 'ImageTool' => Intervention\Image\Facades\Image::class, + 'PDF' => Barryvdh\DomPDF\Facade::class, 'Debugbar' => Barryvdh\Debugbar\Facade::class, /** diff --git a/config/dompdf.php b/config/dompdf.php new file mode 100644 index 000000000..924bdb9cd --- /dev/null +++ b/config/dompdf.php @@ -0,0 +1,266 @@ + false, // Throw an Exception on warnings from dompdf + 'orientation' => 'portrait', + 'defines' => array( + /** + * The location of the DOMPDF font directory + * + * The location of the directory where DOMPDF will store fonts and font metrics + * Note: This directory must exist and be writable by the webserver process. + * *Please note the trailing slash.* + * + * Notes regarding fonts: + * Additional .afm font metrics can be added by executing load_font.php from command line. + * + * Only the original "Base 14 fonts" are present on all pdf viewers. Additional fonts must + * be embedded in the pdf file or the PDF may not display correctly. This can significantly + * increase file size unless font subsetting is enabled. Before embedding a font please + * review your rights under the font license. + * + * Any font specification in the source HTML is translated to the closest font available + * in the font directory. + * + * The pdf standard "Base 14 fonts" are: + * Courier, Courier-Bold, Courier-BoldOblique, Courier-Oblique, + * Helvetica, Helvetica-Bold, Helvetica-BoldOblique, Helvetica-Oblique, + * Times-Roman, Times-Bold, Times-BoldItalic, Times-Italic, + * Symbol, ZapfDingbats. + */ + "DOMPDF_FONT_DIR" => app_path('vendor/dompdf/dompdf/lib/fonts/'), //storage_path('fonts/'), // advised by dompdf (https://github.com/dompdf/dompdf/pull/782) + + /** + * The location of the DOMPDF font cache directory + * + * This directory contains the cached font metrics for the fonts used by DOMPDF. + * This directory can be the same as DOMPDF_FONT_DIR + * + * Note: This directory must exist and be writable by the webserver process. + */ + "DOMPDF_FONT_CACHE" => storage_path('fonts/'), + + /** + * The location of a temporary directory. + * + * The directory specified must be writeable by the webserver process. + * The temporary directory is required to download remote images and when + * using the PFDLib back end. + */ + "DOMPDF_TEMP_DIR" => sys_get_temp_dir(), + + /** + * ==== IMPORTANT ==== + * + * dompdf's "chroot": Prevents dompdf from accessing system files or other + * files on the webserver. All local files opened by dompdf must be in a + * subdirectory of this directory. DO NOT set it to '/' since this could + * allow an attacker to use dompdf to read any files on the server. This + * should be an absolute path. + * This is only checked on command line call by dompdf.php, but not by + * direct class use like: + * $dompdf = new DOMPDF(); $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output(); + */ + "DOMPDF_CHROOT" => realpath(base_path()), + + /** + * Whether to use Unicode fonts or not. + * + * When set to true the PDF backend must be set to "CPDF" and fonts must be + * loaded via load_font.php. + * + * When enabled, dompdf can support all Unicode glyphs. Any glyphs used in a + * document must be present in your fonts, however. + */ + "DOMPDF_UNICODE_ENABLED" => true, + + /** + * Whether to enable font subsetting or not. + */ + "DOMPDF_ENABLE_FONTSUBSETTING" => false, + + /** + * The PDF rendering backend to use + * + * Valid settings are 'PDFLib', 'CPDF' (the bundled R&OS PDF class), 'GD' and + * 'auto'. 'auto' will look for PDFLib and use it if found, or if not it will + * fall back on CPDF. 'GD' renders PDFs to graphic files. {@link + * Canvas_Factory} ultimately determines which rendering class to instantiate + * based on this setting. + * + * Both PDFLib & CPDF rendering backends provide sufficient rendering + * capabilities for dompdf, however additional features (e.g. object, + * image and font support, etc.) differ between backends. Please see + * {@link PDFLib_Adapter} for more information on the PDFLib backend + * and {@link CPDF_Adapter} and lib/class.pdf.php for more information + * on CPDF. Also see the documentation for each backend at the links + * below. + * + * The GD rendering backend is a little different than PDFLib and + * CPDF. Several features of CPDF and PDFLib are not supported or do + * not make any sense when creating image files. For example, + * multiple pages are not supported, nor are PDF 'objects'. Have a + * look at {@link GD_Adapter} for more information. GD support is + * experimental, so use it at your own risk. + * + * @link http://www.pdflib.com + * @link http://www.ros.co.nz/pdf + * @link http://www.php.net/image + */ + "DOMPDF_PDF_BACKEND" => "CPDF", + + /** + * PDFlib license key + * + * If you are using a licensed, commercial version of PDFlib, specify + * your license key here. If you are using PDFlib-Lite or are evaluating + * the commercial version of PDFlib, comment out this setting. + * + * @link http://www.pdflib.com + * + * If pdflib present in web server and auto or selected explicitely above, + * a real license code must exist! + */ + //"DOMPDF_PDFLIB_LICENSE" => "your license key here", + + /** + * html target media view which should be rendered into pdf. + * List of types and parsing rules for future extensions: + * http://www.w3.org/TR/REC-html40/types.html + * screen, tty, tv, projection, handheld, print, braille, aural, all + * Note: aural is deprecated in CSS 2.1 because it is replaced by speech in CSS 3. + * Note, even though the generated pdf file is intended for print output, + * the desired content might be different (e.g. screen or projection view of html file). + * Therefore allow specification of content here. + */ + "DOMPDF_DEFAULT_MEDIA_TYPE" => "screen", + + /** + * The default paper size. + * + * North America standard is "letter"; other countries generally "a4" + * + * @see CPDF_Adapter::PAPER_SIZES for valid sizes ('letter', 'legal', 'A4', etc.) + */ + "DOMPDF_DEFAULT_PAPER_SIZE" => "a4", + + /** + * The default font family + * + * Used if no suitable fonts can be found. This must exist in the font folder. + * @var string + */ + "DOMPDF_DEFAULT_FONT" => "dejavu sans", + + /** + * Image DPI setting + * + * This setting determines the default DPI setting for images and fonts. The + * DPI may be overridden for inline images by explictly setting the + * image's width & height style attributes (i.e. if the image's native + * width is 600 pixels and you specify the image's width as 72 points, + * the image will have a DPI of 600 in the rendered PDF. The DPI of + * background images can not be overridden and is controlled entirely + * via this parameter. + * + * For the purposes of DOMPDF, pixels per inch (PPI) = dots per inch (DPI). + * If a size in html is given as px (or without unit as image size), + * this tells the corresponding size in pt. + * This adjusts the relative sizes to be similar to the rendering of the + * html page in a reference browser. + * + * In pdf, always 1 pt = 1/72 inch + * + * Rendering resolution of various browsers in px per inch: + * Windows Firefox and Internet Explorer: + * SystemControl->Display properties->FontResolution: Default:96, largefonts:120, custom:? + * Linux Firefox: + * about:config *resolution: Default:96 + * (xorg screen dimension in mm and Desktop font dpi settings are ignored) + * + * Take care about extra font/image zoom factor of browser. + * + * In images, size in pixel attribute, img css style, are overriding + * the real image dimension in px for rendering. + * + * @var int + */ + "DOMPDF_DPI" => 96, + + /** + * Enable inline PHP + * + * If this setting is set to true then DOMPDF will automatically evaluate + * inline PHP contained within tags. + * + * Enabling this for documents you do not trust (e.g. arbitrary remote html + * pages) is a security risk. Set this option to false if you wish to process + * untrusted documents. + * + * @var bool + */ + "DOMPDF_ENABLE_PHP" => false, + + /** + * Enable inline Javascript + * + * If this setting is set to true then DOMPDF will automatically insert + * JavaScript code contained within tags. + * + * @var bool + */ + "DOMPDF_ENABLE_JAVASCRIPT" => true, + + /** + * Enable remote file access + * + * If this setting is set to true, DOMPDF will access remote sites for + * images and CSS files as required. + * This is required for part of test case www/test/image_variants.html through www/examples.php + * + * Attention! + * This can be a security risk, in particular in combination with DOMPDF_ENABLE_PHP and + * allowing remote access to dompdf.php or on allowing remote html code to be passed to + * $dompdf = new DOMPDF(, $dompdf->load_html(..., + * This allows anonymous users to download legally doubtful internet content which on + * tracing back appears to being downloaded by your server, or allows malicious php code + * in remote html pages to be executed by your server with your account privileges. + * + * @var bool + */ + "DOMPDF_ENABLE_REMOTE" => true, + + /** + * A ratio applied to the fonts height to be more like browsers' line height + */ + "DOMPDF_FONT_HEIGHT_RATIO" => 1.1, + + /** + * Enable CSS float + * + * Allows people to disabled CSS float support + * @var bool + */ + "DOMPDF_ENABLE_CSS_FLOAT" => true, + + + /** + * Use the more-than-experimental HTML5 Lib parser + */ + "DOMPDF_ENABLE_HTML5PARSER" => true, + + + ), + + +); diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss index 22c9994d4..de1f3d1d0 100644 --- a/resources/assets/sass/_header.scss +++ b/resources/assets/sass/_header.scss @@ -161,6 +161,12 @@ form.search-box { padding: $-xs 0; color: #555; text-align: left !important; + &.wide { + min-width: 220px; + } + .text-muted { + color: #999; + } a { display: block; padding: $-xs $-m; diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 29a46302b..7677b2fa4 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -27,8 +27,8 @@ $-xs: 6px; $-xxs: 3px; // Fonts -$heading: 'Roboto', Helvetica, Arial, sans-serif; -$text: 'Roboto', Helvetica, Arial, sans-serif; +$heading: 'Roboto', 'DejaVu Sans', Helvetica, Arial, sans-serif; +$text: 'Roboto', 'DejaVu Sans', Helvetica, Arial, sans-serif; $fs-m: 15px; $fs-s: 14px; diff --git a/resources/assets/sass/export-styles.scss b/resources/assets/sass/export-styles.scss index 31a89b4ce..90fdb196c 100644 --- a/resources/assets/sass/export-styles.scss +++ b/resources/assets/sass/export-styles.scss @@ -1,4 +1,4 @@ -@import "reset"; +//@import "reset"; @import "variables"; @import "mixins"; @import "html"; diff --git a/resources/views/pages/export.blade.php b/resources/views/pages/export.blade.php new file mode 100644 index 000000000..96f06290e --- /dev/null +++ b/resources/views/pages/export.blade.php @@ -0,0 +1,33 @@ + + + + + {{ $page->name }} + + + @yield('head') + + +
+
+
+
+ + @include('pages/page-display') + +
+ +

+ Created {{$page->created_at->toDayDateTimeString()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif +
+ Last Updated {{$page->updated_at->toDayDateTimeString()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif +

+ +
+
+
+
+ + diff --git a/resources/views/pages/pdf.blade.php b/resources/views/pages/pdf.blade.php index 73cf131bc..1077c0931 100644 --- a/resources/views/pages/pdf.blade.php +++ b/resources/views/pages/pdf.blade.php @@ -1,32 +1,24 @@ - - - - - {{ $page->name }} +@extends('pages/export') +@section('head') - - -
-
-
-
- - @include('pages/page-display') - -
- -

- Created {{$page->created_at->diffForHumans()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif -
- Last Updated {{$page->updated_at->diffForHumans()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif -

- -
-
-
-
- - +@stop \ No newline at end of file diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index f2ce6fb07..a2c82fd9d 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -20,9 +20,11 @@
-
Export Page
-