Merge pull request #11 from lbausch/development

Version 2.0

Author: lbausch

.env.example

@@ -1,19 +1,23 @@
 APP_ENV=production
 APP_DEBUG=false
-APP_URL=http://localhost:8000
-APP_TIMEZONE=Europe/Berlin
 APP_KEY=SomeRandomString
+APP_URL=http://localhost
+APP_TIMEZONE=Europe/Berlin
+APP_LOG=daily
 
-# database for SQLgreyGUI
-# if you want to use a single database for both SQLgreyGUI and SQLgrey
-# use only this config block
+# Database for SQLgreyGUI
+# If you want to use a single database for both SQLgreyGUI and SQLgrey use only this config block
+DB_CONNECTION=mysql
 DB_HOST=localhost
+DB_PORT=3306
 DB_DATABASE=sqlgrey
 DB_USERNAME=sqlgrey
 DB_PASSWORD=sqlgrey
 
 # Uncomment the following lines if SQLgrey resides in a different database
+#SQLGREY_DB_CONNECTION=mysql
 #SQLGREY_DB_HOST=null
+#SQLGREY_DB_PORT=3306
 #SQLGREY_DB_DATABASE=null
 #SQLGREY_DB_USERNAME=null
 #SQLGREY_DB_PASSWORD=null
@@ -22,7 +26,11 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
-MAIL_DRIVER=mail
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=log
 MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null

.gitignore

@@ -1,11 +1,16 @@
 /vendor
 /node_modules
+/public/storage
 Homestead.yaml
 Homestead.json
 .env
 
-## PhpStorm
-.idea/
+## Development
+/.idea/
+/.vagrant/
+.phpstorm.meta.php
+_ide_helper.php
+_ide_helper_models.php
 
 ## Assets
 /public/assets/min

.travis.yml

@@ -0,0 +1,11 @@
+language: php
+
+php:
+  - '5.5'
+  - '5.6'
+  - '7.0'
+
+install:
+  - ./ci/setup_environment.sh
+
+script: ./ci/run_tests.sh

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 - 2015 Lorenz Bausch
+Copyright (c) 2014 - 2016 Lorenz Bausch
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,9 @@
 SQLgreyGUI
 ==========
 
-Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel 5](http://laravel.com/) Framework.
+[![Build Status](https://travis-ci.org/lbausch/SQLgreyGUI.svg?branch=master)](https://travis-ci.org/lbausch/SQLgreyGUI)
+
+Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel 5](https://laravel.com/) Framework.
 
 ## Features
 * Dashboard: quick overview of emails / domains in greylist, whitelist, opt-out and opt-in
@@ -22,7 +24,7 @@ Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel
 1. grab a copy of the code (download [master.zip](https://github.com/lbausch/SQLgreyGUI/archive/master.zip) or use `git clone https://github.com/lbausch/SQLgreyGUI.git`)
 2. make your webserver use the `public` directory as document root
 3. copy `.env.example` to `.env` and adjust it to your needs (`APP_URL`, `APP_TIMEZONE`, `APP_KEY` and database settings)
-4. run `composer install` to install all necessary dependencies
+4. run `composer install --no-dev` to install all necessary dependencies
 5. set a new application key with `php artisan key:generate`
 6. run `php artisan migrate --seed --force` to create the database tables and an admin user
 7. login with the username `admin` and the password `joh316` (you can change the password in "Settings")
@@ -31,3 +33,5 @@ Web interface for [SQLgrey](http://sqlgrey.sourceforge.net/) using the [Laravel
 ## Screenshots
 ![Dasboard](/../screenshots/dashboard.png?raw=true "Dashboard")
 ![Auto-Whitelist](/../screenshots/auto-whitelist.png?raw=true "Auto-Whitelist")
+
+Follow [SQLgreyGUI](https://twitter.com/sqlgreygui) on Twitter

Vagrantfile

@@ -0,0 +1,28 @@
+require 'json'
+require 'yaml'
+
+VAGRANTFILE_API_VERSION ||= "2"
+confDir = $confDir ||= File.expand_path("vendor/laravel/homestead", File.dirname(__FILE__))
+
+homesteadYamlPath = "Homestead.yaml"
+homesteadJsonPath = "Homestead.json"
+afterScriptPath = "after.sh"
+aliasesPath = "aliases"
+
+require File.expand_path(confDir + '/scripts/homestead.rb')
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+    if File.exists? aliasesPath then
+        config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
+    end
+
+    if File.exists? homesteadYamlPath then
+        Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
+    elsif File.exists? homesteadJsonPath then
+        Homestead.configure(config, JSON.parse(File.read(homesteadJsonPath)))
+    end
+
+    if File.exists? afterScriptPath then
+        config.vm.provision "shell", path: afterScriptPath
+    end
+end

app/Exceptions/Handler.php

@@ -3,9 +3,10 @@
 namespace SQLgreyGUI\Exceptions;
 
 use Exception;
+use Illuminate\Validation\ValidationException;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -16,8 +17,10 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontReport = [
+        AuthorizationException::class,
         HttpException::class,
         ModelNotFoundException::class,
+        ValidationException::class,
     ];
 
     /**
@@ -29,7 +32,7 @@ class Handler extends ExceptionHandler
      */
     public function report(Exception $e)
     {
-        return parent::report($e);
+        parent::report($e);
     }
 
     /**
@@ -42,10 +45,6 @@ public function report(Exception $e)
      */
     public function render($request, Exception $e)
     {
-        if ($e instanceof ModelNotFoundException) {
-            $e = new NotFoundHttpException($e->getMessage(), $e);
-        }
-
         return parent::render($request, $e);
     }
 }

app/Http/Controllers/AboutController.php

@@ -4,14 +4,6 @@
 
 class AboutController extends Controller
 {
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Index.
      *

app/Http/Controllers/Auth/AuthController.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace SQLgreyGUI\Http\Controllers\Auth;
+
+use SQLgreyGUI\Models\User;
+use Validator;
+use SQLgreyGUI\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Foundation\Auth\ThrottlesLogins;
+use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
+
+class AuthController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Registration & Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users, as well as the
+    | authentication of existing users. By default, this controller uses
+    | a simple trait to add these behaviors. Why don't you explore it?
+    |
+    */
+
+    use AuthenticatesAndRegistersUsers, ThrottlesLogins;
+
+    /**
+     * Where to redirect users after login / registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/';
+
+    /**
+     * Login username to be used by the controller.
+     *
+     * @var string
+     */
+    protected $username = 'username';
+
+    /**
+     * Create a new authentication controller instance.
+     */
+    public function __construct()
+    {
+        $this->middleware($this->guestMiddleware(), ['except' => 'logout']);
+    }
+
+    /**
+     * Get the needed authorization credentials from the request.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    protected function getCredentials(Request $request)
+    {
+        $data = $request->only($this->loginUsername(), 'password');
+        $data['enabled'] = true;
+
+        return $data;
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param array $data
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name' => 'required|max:255',
+            'email' => 'required|email|max:255|unique:users',
+            'password' => 'required|min:6|confirmed',
+        ]);
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @param array $data
+     *
+     * @return User
+     */
+    protected function create(array $data)
+    {
+        return User::create([
+            'name' => $data['name'],
+            'email' => $data['email'],
+            'password' => bcrypt($data['password']),
+        ]);
+    }
+}

app/Http/Controllers/Auth/PasswordController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+class PasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+    /**
+     * Create a new password controller instance.
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}