beenull/speedtest
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into docker

Browse source
This commit is contained in:
adolfintel 2019-02-14 17:04:17 +01:00
parent 3f28ef4ffc 78c0190618
commit 36277bac7c
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc.md
View file

@ -451,6 +451,10 @@ This is a configuration issue. Make a file called web.config in wwwroot and adap
</configuration>
```
#### ID obfuscation doesn't work (incorrect output, blank results image)
ID obfuscation only works on 64 bit PHP (requires PHP_INT_SIZE to be 8).
Note that older versions of PHP 5 on Windows use PHP_INT_SIZE of 4, even if they're 64 bit. If you're in this situation, update your PHP install.
## Known bugs and limitations
### General
* The ping/jitter test is measured by seeing how long it takes for an empty XHR to complete. It is not an acutal ICMP ping. Different browsers may also show different results, especially on very fast connections on slow devices.

19
telemetry/idObfuscation.php
View file

@ -18,22 +18,25 @@ function getObfuscationSalt(){
This is a simple reversible hash function I made for encoding and decoding test IDs.
It is not cryptographically secure, don't use it to hash passwords or something!
*/
function obfdeobf($id){
function obfdeobf($id,$dec){
$salt=getObfuscationSalt()&0xFFFFFFFF;
$id=$id&0xFFFFFFFF;
for($i=0;$i<16;$i++){
if($dec){
$id=$id^$salt;
$salt=(($salt>>1)&0xFFFFFFFF)|(($salt&0x00000001)<<31);
$id=((0x0000FFFF&$id)<<16)|((0xFFFF0000&$id)>>16);
$id=(($id>>1)&0xFFFFFFFF)|(($id&0x00000001)<<31);
$id=(($id&0xAAAAAAAA)>>1)|($id&0x55555555)<<1;
$id=(($id&0x0000FFFF)<<16)|(($id&0xFFFF0000)>>16);
return $id;
}else{
$id=(($id&0x0000FFFF)<<16)|(($id&0xFFFF0000)>>16);
$id=(($id&0xAAAAAAAA)>>1)|($id&0x55555555)<<1;
return $id^$salt;
}
return $id;
}
function obfuscateId($id){
return str_pad(base_convert(obfdeobf($id+1),10,36),7,0,STR_PAD_LEFT);
return str_pad(base_convert(obfdeobf($id+1,false),10,36),7,0,STR_PAD_LEFT);
}
function deobfuscateId($id){
return obfdeobf(base_convert($id,36,10))-1;
return obfdeobf(base_convert($id,36,10),true)-1;
}
//IMPORTANT: DO NOT ADD ANYTHING BELOW THE PHP CLOSING TAG, NOT EVEN EMPTY LINES!