Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
a0cc8e73
Commit
a0cc8e73
authored
Feb 05, 2021
by
Dominik Hebeler
Browse files
removing key if a wrong one is set
parent
e17bc345
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/KeyController.php
View file @
a0cc8e73
...
...
@@ -62,9 +62,16 @@ class KeyController extends Controller
public
function
removeKey
(
Request
$request
)
{
$instantRedir
=
$request
->
input
(
"ir"
,
""
);
$redirUrl
=
$request
->
input
(
'redirUrl'
,
""
);
Cookie
::
queue
(
Cookie
::
forget
(
'key'
)
);
Cookie
::
queue
(
"key"
,
""
,
0
,
'/'
,
null
,
false
,
false
);
$url
=
LaravelLocalization
::
getLocalizedURL
(
LaravelLocalization
::
getCurrentLocale
(),
action
(
'KeyController@index'
,
[
'redirUrl'
=>
$redirUrl
]));
return
redirect
(
$url
);
$host
=
$request
->
getHttpHost
();
if
(
!
empty
(
$instantRedir
)
&&
in_array
(
$host
,
[
"metager.de"
,
"metager.es"
,
"metager.org"
,
"metager3.de"
,
"localhost:8080"
])){
return
redirect
(
$instantRedir
);
}
else
{
return
redirect
(
$url
);
}
}
}
app/Http/Kernel.php
View file @
a0cc8e73
...
...
@@ -64,5 +64,6 @@ class Kernel extends HttpKernel
'useragentmaster'
=>
\
App\Http\Middleware\UserAgentMaster
::
class
,
'browserverification'
=>
\
App\Http\Middleware\BrowserVerification
::
class
,
'keyvalidation'
=>
\
App\Http\Middleware\KeyValidation
::
class
,
'removekey'
=>
\
App\Http\Middleware\RemoveKey
::
class
,
];
}
app/Http/Middleware/RemoveKey.php
0 → 100644
View file @
a0cc8e73
<?php
namespace
App\Http\Middleware
;
use
Closure
;
use
Cookie
;
class
RemoveKey
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public
function
handle
(
$request
,
Closure
$next
)
{
// Check if a wrong Key Cookie is set and if so remove it
if
(
Cookie
::
has
(
"key"
)
&&
!
app
(
'App\Models\Key'
)
->
getStatus
()){
return
redirect
(
route
(
"removeCookie"
,
[
"ir"
=>
url
()
->
full
()]));
}
return
$next
(
$request
);
}
}
routes/cookie.php
View file @
a0cc8e73
...
...
@@ -8,7 +8,7 @@ Route::group(
function
()
{
Route
::
get
(
'meta/key'
,
"KeyController@index"
);
Route
::
post
(
'meta/key'
,
'KeyController@setKey'
);
Route
::
post
(
'meta/key/remove'
,
'KeyController@removeKey'
);
Route
::
any
(
'meta/key/remove'
,
'KeyController@removeKey'
)
->
name
(
"removeCookie"
)
;
Route
::
group
([
'prefix'
=>
'meta/settings'
,
...
...
routes/web.php
View file @
a0cc8e73
...
...
@@ -33,7 +33,7 @@ Route::group(
function
()
{
/** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/
Route
::
get
(
'/'
,
'StartpageController@loadStartPage'
)
->
name
(
"startpage"
);
Route
::
get
(
'/'
,
'StartpageController@loadStartPage'
)
->
name
(
"startpage"
)
->
middleware
(
"removekey"
)
;
Route
::
get
(
'asso'
,
function
()
{
return
view
(
'assoziator.asso'
)
...
...
@@ -221,7 +221,7 @@ Route::group(
return
redirect
(
LaravelLocalization
::
getLocalizedURL
(
LaravelLocalization
::
getCurrentLocale
(),
'/'
));
});
Route
::
match
([
'get'
,
'post'
],
'meta/meta.ger3'
,
'MetaGerSearch@search'
)
->
middleware
(
'browserverification'
,
'humanverification'
,
'useragentmaster'
)
->
name
(
"resultpage"
);
Route
::
match
([
'get'
,
'post'
],
'meta/meta.ger3'
,
'MetaGerSearch@search'
)
->
middleware
(
'removekey'
,
'browserverification'
,
'humanverification'
,
'useragentmaster'
)
->
name
(
"resultpage"
);
Route
::
get
(
'meta/loadMore'
,
'MetaGerSearch@loadMore'
);
Route
::
post
(
'img/cat.png'
,
'HumanVerification@remove'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment