Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MetaGer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jens Korte
MetaGer
Commits
bac6204c
Commit
bac6204c
authored
Jun 04, 2019
by
Dominik Hebeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed humanverification
parent
d44392ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
13 deletions
+32
-13
app/Http/Controllers/HumanVerification.php
app/Http/Controllers/HumanVerification.php
+19
-6
app/Http/Middleware/HumanVerification.php
app/Http/Middleware/HumanVerification.php
+13
-7
No files found.
app/Http/Controllers/HumanVerification.php
View file @
bac6204c
...
...
@@ -108,7 +108,13 @@ class HumanVerification extends Controller
private
static
function
removeUser
(
$request
,
$uid
)
{
$redis
=
Redis
::
connection
(
'redisCache'
);
$id
=
hash
(
"sha512"
,
HumanVerification
::
getIP
(
$request
));
$ip
=
$request
->
ip
();
$id
=
""
;
if
(
HumanVerification
::
isTor
(
$ip
))
{
$id
=
hash
(
"sha512"
,
"999.999.999.999"
);
}
else
{
$id
=
hash
(
"sha512"
,
$ip
);
}
$userList
=
$redis
->
smembers
(
HumanVerification
::
PREFIX
.
"."
.
$id
);
$pipe
=
$redis
->
pipeline
();
...
...
@@ -168,16 +174,23 @@ class HumanVerification extends Controller
private
static
function
checkId
(
$request
,
$id
)
{
if
(
hash
(
"sha512"
,
HumanVerification
::
getIP
(
$request
)
.
$_SERVER
[
"AGENT"
]
.
"uid"
)
===
$id
)
{
$uid
=
""
;
$ip
=
$request
->
ip
();
if
(
$HumanVerification
::
isTor
(
$ip
))
{
$uid
=
hash
(
"sha512"
,
"999.999.999.999"
.
$ip
.
$_SERVER
[
"AGENT"
]
.
"uid"
);
}
else
{
$uid
=
hash
(
"sha512"
,
$ip
.
$_SERVER
[
"AGENT"
]
.
"uid"
);
}
if
(
$uid
===
$id
)
{
return
true
;
}
else
{
return
false
;
}
}
private
static
function
getIP
(
$request
)
private
static
function
isTor
(
$ip
)
{
$ip
=
$request
->
ip
();
$serverAddress
=
empty
(
$_SERVER
[
'SERVER_ADDR'
])
?
"144.76.88.77"
:
$_SERVER
[
'SERVER_ADDR'
];
$queryUrl
=
"https://tor.metager.org?password="
.
urlencode
(
env
(
"TOR_PASSWORD"
))
.
"&ra="
.
urlencode
(
$ip
)
.
"&sa="
.
urlencode
(
$serverAddress
)
.
"&sp=443"
;
...
...
@@ -189,9 +202,9 @@ class HumanVerification extends Controller
curl_close
(
$ch
);
if
(
$httpcode
===
200
)
{
return
"999.999.999.999"
;
return
true
;
}
else
{
return
$ip
;
return
false
;
}
}
}
app/Http/Middleware/HumanVerification.php
View file @
bac6204c
...
...
@@ -26,9 +26,16 @@ class HumanVerification
$prefix
=
"humanverification"
;
$redis
=
Redis
::
connection
(
'redisCache'
);
try
{
$ip
=
$this
->
getIP
();
$id
=
hash
(
"sha512"
,
$ip
);
$uid
=
hash
(
"sha512"
,
$ip
.
$_SERVER
[
"AGENT"
]
.
"uid"
);
$ip
=
$request
->
ip
();
$id
=
""
;
$uid
=
""
;
if
(
$this
->
isTor
(
$ip
))
{
$id
=
hash
(
"sha512"
,
"999.999.999.999"
);
$uid
=
hash
(
"sha512"
,
"999.999.999.999"
.
$ip
.
$_SERVER
[
"AGENT"
]
.
"uid"
);
}
else
{
$id
=
hash
(
"sha512"
,
$ip
);
$uid
=
hash
(
"sha512"
,
$ip
.
$_SERVER
[
"AGENT"
]
.
"uid"
);
}
unset
(
$_SERVER
[
"AGENT"
]);
/**
...
...
@@ -182,9 +189,8 @@ class HumanVerification
}
private
function
getIP
(
)
private
function
isTor
(
$ip
)
{
$ip
=
\
Request
::
ip
();
$serverAddress
=
empty
(
$_SERVER
[
'SERVER_ADDR'
])
?
"144.76.88.77"
:
$_SERVER
[
'SERVER_ADDR'
];
$queryUrl
=
"https://tor.metager.org?password="
.
urlencode
(
env
(
"TOR_PASSWORD"
))
.
"&ra="
.
urlencode
(
$ip
)
.
"&sa="
.
urlencode
(
$serverAddress
)
.
"&sp=443"
;
...
...
@@ -196,9 +202,9 @@ class HumanVerification
curl_close
(
$ch
);
if
(
$httpcode
===
200
)
{
return
"999.999.999.999"
;
return
true
;
}
else
{
return
$ip
;
return
false
;
}
}
}
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