flashii/eeprom
1
0
Fork 1
Code Pull requests Releases Activity

Compare commits

base: flashii:fcc6f13bd7daecb0d86918cb79c7de5e9162903d
Branches Tags
flashii:master
...
compare: flashii:a409410ea09878628c4e6194b6eee6e5ce9cd918
Branches Tags
flashii:master

2 commits
fcc6f13bd7 ... a409410ea0

Author SHA1 Message Date
flashwave
a409410ea0 Switched EEPROM from private chat auth to public API. 2024-11-19 22:11:14 +00:00
flashwave
c3827334a1 Updated Index library. 2024-11-19 21:29:12 +00:00
6 changed files with 132 additions and 134 deletions
Show stats Expand all files Collapse all files

1
composer.json
View file

@ -1,6 +1,7 @@
{ {
"require": { "require": {
"flashwave/index": "^0.2410", "flashwave/index": "^0.2410",
"flashii/apii": "^0.2",
"sentry/sdk": "^4.0", "sentry/sdk": "^4.0",
"nesbot/carbon": "^3.7" "nesbot/carbon": "^3.7"
}, },

183
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "0bd5a41ea92a75983cfabd9b9052a8a2", "content-hash": "5bb4c1111eb08d57ef2ef77239a4ddc8",
"packages": [ "packages": [
{ {
"name": "carbonphp/carbon-doctrine-types", "name": "carbonphp/carbon-doctrine-types",
@ -75,13 +75,50 @@
], ],
"time": "2024-02-09T16:56:22+00:00" "time": "2024-02-09T16:56:22+00:00"
}, },
{
"name": "flashii/apii",
"version": "v0.2.1",
"source": {
"type": "git",
"url": "https://patchii.net/flashii/apii-php.git",
"reference": "6a93d31375dd7e75ff9264f3024f2208ce602f49"
},
"require": {
"php": ">=8.1"
},
"require-dev": {
"phpstan/phpstan": "^1.12",
"phpunit/phpunit": "^10.5"
},
"type": "library",
"autoload": {
"psr-4": {
"Flashii\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"bsd-3-clause-clear"
],
"authors": [
{
"name": "flashwave",
"email": "packagist@flash.moe",
"homepage": "https://flash.moe",
"role": "mom"
}
],
"description": "Client library for the Flashii.net API.",
"homepage": "https://api.flashii.net",
"time": "2024-11-16T16:03:42+00:00"
},
{ {
"name": "flashwave/index", "name": "flashwave/index",
"version": "v0.2410.51409", "version": "v0.2410.191603",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://patchii.net/flash/index.git", "url": "https://patchii.net/flash/index.git",
"reference": "c43c6eb334f85edf8fa7b5e4058b3ba35a27d960" "reference": "17cdb4d1c239241200d7e30968122a8cd8b26509"
}, },
"require": { "require": {
"ext-mbstring": "*", "ext-mbstring": "*",
@ -102,6 +139,14 @@
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"files": [
"src/Cache/ArrayCache/_ndx.php",
"src/Cache/Memcached/_ndx.php",
"src/Cache/Valkey/_ndx.php",
"src/Db/MariaDb/_ndx.php",
"src/Db/NullDb/_ndx.php",
"src/Db/Sqlite/_ndx.php"
],
"psr-4": { "psr-4": {
"Index\\": "src" "Index\\": "src"
} }
@ -120,7 +165,7 @@
], ],
"description": "Composer package for the common library for my projects.", "description": "Composer package for the common library for my projects.",
"homepage": "https://railgun.sh/index", "homepage": "https://railgun.sh/index",
"time": "2024-10-05T14:10:08+00:00" "time": "2024-10-19T16:04:17+00:00"
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
@ -240,28 +285,28 @@
}, },
{ {
"name": "jean85/pretty-package-versions", "name": "jean85/pretty-package-versions",
"version": "2.0.6", "version": "2.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Jean85/pretty-package-versions.git", "url": "https://github.com/Jean85/pretty-package-versions.git",
"reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4" "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4", "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c4e5f62ba8d7de1734312e4fff32f67a8daaf10",
"reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4", "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer-runtime-api": "^2.0.0", "composer-runtime-api": "^2.1.0",
"php": "^7.1|^8.0" "php": "^7.4|^8.0"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^3.2", "friendsofphp/php-cs-fixer": "^3.2",
"jean85/composer-provided-replaced-stub-package": "^1.0", "jean85/composer-provided-replaced-stub-package": "^1.0",
"phpstan/phpstan": "^1.4", "phpstan/phpstan": "^1.4",
"phpunit/phpunit": "^7.5|^8.5|^9.4", "phpunit/phpunit": "^7.5|^8.5|^9.6",
"vimeo/psalm": "^4.3" "vimeo/psalm": "^4.3 || ^5.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -293,26 +338,26 @@
], ],
"support": { "support": {
"issues": "https://github.com/Jean85/pretty-package-versions/issues", "issues": "https://github.com/Jean85/pretty-package-versions/issues",
"source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6" "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.0"
}, },
"time": "2024-03-08T09:58:59+00:00" "time": "2024-11-18T16:19:46+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "3.8.0", "version": "3.8.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f" "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
"reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f", "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"carbonphp/carbon-doctrine-types": "*", "carbonphp/carbon-doctrine-types": "<100.0",
"ext-json": "*", "ext-json": "*",
"php": "^8.1", "php": "^8.1",
"psr/clock": "^1.0", "psr/clock": "^1.0",
@ -401,7 +446,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-08-19T06:22:39+00:00" "time": "2024-11-07T17:46:48+00:00"
}, },
{ {
"name": "psr/clock", "name": "psr/clock",
@ -710,16 +755,16 @@
}, },
{ {
"name": "sentry/sentry", "name": "sentry/sentry",
"version": "4.9.0", "version": "4.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/getsentry/sentry-php.git", "url": "https://github.com/getsentry/sentry-php.git",
"reference": "788ec170f51ebb22f2809a1e3f78b19ccd39b70d" "reference": "2af937d47d8aadb8dab0b1d7b9557e495dd12856"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/788ec170f51ebb22f2809a1e3f78b19ccd39b70d", "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/2af937d47d8aadb8dab0b1d7b9557e495dd12856",
"reference": "788ec170f51ebb22f2809a1e3f78b19ccd39b70d", "reference": "2af937d47d8aadb8dab0b1d7b9557e495dd12856",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -737,12 +782,12 @@
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^3.4", "friendsofphp/php-cs-fixer": "^3.4",
"guzzlehttp/promises": "^1.0|^2.0", "guzzlehttp/promises": "^2.0.3",
"guzzlehttp/psr7": "^1.8.4|^2.1.1", "guzzlehttp/psr7": "^1.8.4|^2.1.1",
"monolog/monolog": "^1.6|^2.0|^3.0", "monolog/monolog": "^1.6|^2.0|^3.0",
"phpbench/phpbench": "^1.0", "phpbench/phpbench": "^1.0",
"phpstan/phpstan": "^1.3", "phpstan/phpstan": "^1.3",
"phpunit/phpunit": "^8.5.14|^9.4", "phpunit/phpunit": "^8.5|^9.6",
"symfony/phpunit-bridge": "^5.2|^6.0|^7.0", "symfony/phpunit-bridge": "^5.2|^6.0|^7.0",
"vimeo/psalm": "^4.17" "vimeo/psalm": "^4.17"
}, },
@ -783,7 +828,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/getsentry/sentry-php/issues", "issues": "https://github.com/getsentry/sentry-php/issues",
"source": "https://github.com/getsentry/sentry-php/tree/4.9.0" "source": "https://github.com/getsentry/sentry-php/tree/4.10.0"
}, },
"funding": [ "funding": [
{ {
@ -795,20 +840,20 @@
"type": "custom" "type": "custom"
} }
], ],
"time": "2024-08-08T14:40:50+00:00" "time": "2024-11-06T07:44:19+00:00"
}, },
{ {
"name": "symfony/clock", "name": "symfony/clock",
"version": "v7.1.1", "version": "v7.1.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/clock.git", "url": "https://github.com/symfony/clock.git",
"reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7" "reference": "97bebc53548684c17ed696bc8af016880f0f098d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/clock/zipball/3dfc8b084853586de51dd1441c6242c76a28cbe7", "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d",
"reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7", "reference": "97bebc53548684c17ed696bc8af016880f0f098d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -853,7 +898,7 @@
"time" "time"
], ],
"support": { "support": {
"source": "https://github.com/symfony/clock/tree/v7.1.1" "source": "https://github.com/symfony/clock/tree/v7.1.6"
}, },
"funding": [ "funding": [
{ {
@ -869,7 +914,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-05-31T14:57:53+00:00" "time": "2024-09-25T14:20:29+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
@ -940,16 +985,16 @@
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v7.1.5", "version": "v7.1.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff" "reference": "caa1e521edb2650b8470918dfe51708c237f0598"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/711d2e167e8ce65b05aea6b258c449671cdd38ff", "url": "https://api.github.com/repos/symfony/mime/zipball/caa1e521edb2650b8470918dfe51708c237f0598",
"reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff", "reference": "caa1e521edb2650b8470918dfe51708c237f0598",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1004,7 +1049,7 @@
"mime-type" "mime-type"
], ],
"support": { "support": {
"source": "https://github.com/symfony/mime/tree/v7.1.5" "source": "https://github.com/symfony/mime/tree/v7.1.6"
}, },
"funding": [ "funding": [
{ {
@ -1020,20 +1065,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-09-20T08:28:38+00:00" "time": "2024-10-25T15:11:02+00:00"
}, },
{ {
"name": "symfony/options-resolver", "name": "symfony/options-resolver",
"version": "v7.1.1", "version": "v7.1.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/options-resolver.git", "url": "https://github.com/symfony/options-resolver.git",
"reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55" "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55", "url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85",
"reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55", "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1071,7 +1116,7 @@
"options" "options"
], ],
"support": { "support": {
"source": "https://github.com/symfony/options-resolver/tree/v7.1.1" "source": "https://github.com/symfony/options-resolver/tree/v7.1.6"
}, },
"funding": [ "funding": [
{ {
@ -1087,7 +1132,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-05-31T14:57:53+00:00" "time": "2024-09-25T14:20:29+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -1566,16 +1611,16 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v7.1.5", "version": "v7.1.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea" "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/235535e3f84f3dfbdbde0208ede6ca75c3a489ea", "url": "https://api.github.com/repos/symfony/translation/zipball/b9f72ab14efdb6b772f85041fa12f820dee8d55f",
"reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea", "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1640,7 +1685,7 @@
"description": "Provides tools to internationalize your application", "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v7.1.5" "source": "https://github.com/symfony/translation/tree/v7.1.6"
}, },
"funding": [ "funding": [
{ {
@ -1656,7 +1701,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-09-16T06:30:38+00:00" "time": "2024-09-28T12:35:13+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",
@ -1738,16 +1783,16 @@
}, },
{ {
"name": "twig/html-extra", "name": "twig/html-extra",
"version": "v3.13.0", "version": "v3.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/html-extra.git", "url": "https://github.com/twigphp/html-extra.git",
"reference": "8229e750091171c1f11801a525927811c7ac5a7e" "reference": "2086023d3ffc4bae2b1115f715d17f97fd013665"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/html-extra/zipball/8229e750091171c1f11801a525927811c7ac5a7e", "url": "https://api.github.com/repos/twigphp/html-extra/zipball/2086023d3ffc4bae2b1115f715d17f97fd013665",
"reference": "8229e750091171c1f11801a525927811c7ac5a7e", "reference": "2086023d3ffc4bae2b1115f715d17f97fd013665",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1790,7 +1835,7 @@
"twig" "twig"
], ],
"support": { "support": {
"source": "https://github.com/twigphp/html-extra/tree/v3.13.0" "source": "https://github.com/twigphp/html-extra/tree/v3.15.0"
}, },
"funding": [ "funding": [
{ {
@ -1802,20 +1847,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-09-03T13:08:40+00:00" "time": "2024-09-30T06:41:48+00:00"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v3.14.0", "version": "v3.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", "url": "https://api.github.com/repos/twigphp/Twig/zipball/2d5b3964cc21d0188633d7ddce732dc8e874db02",
"reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1869,7 +1914,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/twigphp/Twig/issues", "issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v3.14.0" "source": "https://github.com/twigphp/Twig/tree/v3.15.0"
}, },
"funding": [ "funding": [
{ {
@ -1881,22 +1926,22 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-09-09T17:55:12+00:00" "time": "2024-11-17T15:59:19+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.12.5", "version": "1.12.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17" "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d1fc20a962a91be578bcfe7cf939e6e1a2ff733",
"reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17", "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1941,7 +1986,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-09-26T12:45:22+00:00" "time": "2024-11-17T14:08:01+00:00"
} }
], ],
"aliases": [], "aliases": [],

4
eeprom.php
View file

@ -2,7 +2,7 @@
namespace EEPROM; namespace EEPROM;
use Index\Config\Fs\FsConfig; use Index\Config\Fs\FsConfig;
use Index\Db\DbTools; use Index\Db\DbBackends;
define('PRM_STARTUP', microtime(true)); define('PRM_STARTUP', microtime(true));
define('PRM_ROOT', __DIR__); define('PRM_ROOT', __DIR__);
@ -40,7 +40,7 @@ if(!is_dir(PRM_UPLOADS))
if(!is_dir(PRM_THUMBS)) if(!is_dir(PRM_THUMBS))
mkdir(PRM_THUMBS, 0775, true); mkdir(PRM_THUMBS, 0775, true);
$db = DbTools::create($cfg->getString('database:dsn', 'null:')); $db = DbBackends::create($cfg->getString('database:dsn', 'null:'));
$db->execute('SET SESSION time_zone = \'+00:00\', sql_mode = \'STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION\';'); $db->execute('SET SESSION time_zone = \'+00:00\', sql_mode = \'STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION\';');
$eeprom = new EEPROMContext($cfg, $db); $eeprom = new EEPROMContext($cfg, $db);

23
src/Auth/AuthRoutes.php
View file

@ -2,6 +2,8 @@
namespace EEPROM\Auth; namespace EEPROM\Auth;
use EEPROM\Users\UsersContext; use EEPROM\Users\UsersContext;
use Flashii\{FlashiiClient,FlashiiUrls};
use Flashii\Credentials\{BearerCredentials,MisuzuCredentials};
use Index\Config\Config; use Index\Config\Config;
use Index\Http\Routing\{HttpMiddleware,RouteHandler,RouteHandlerTrait}; use Index\Http\Routing\{HttpMiddleware,RouteHandler,RouteHandlerTrait};
@ -28,16 +30,19 @@ class AuthRoutes implements RouteHandler {
$authMethod = strval($authParts[0] ?? ''); $authMethod = strval($authParts[0] ?? '');
$authToken = strval($authParts[1] ?? ''); $authToken = strval($authParts[1] ?? '');
if(strcasecmp($authMethod, 'misuzu') === 0 || strcasecmp($authMethod, 'bearer') === 0) { $isMisuzu = strcasecmp($authMethod, 'misuzu') === 0;
$authResult = ChatAuth::attempt( $isBearer = strcasecmp($authMethod, 'bearer') === 0;
$this->config->getString('endpoint'),
$authMethod,
$this->config->getString('secret'),
$authToken
);
if(!empty($authResult->success)) if($isMisuzu || $isBearer) {
$this->authInfo->setInfo($this->usersCtx->getUser($authResult->user_id)); $credentials = $isMisuzu ? new MisuzuCredentials($authToken) : new BearerCredentials($authToken);
$flashii = new FlashiiClient('EEPROM', $credentials, new FlashiiUrls(
$this->config->getString('api', FlashiiUrls::PROD_API_URL),
$this->config->getString('id', FlashiiUrls::PROD_ID_URL)
));
$authInfo = $flashii->v1()->me();
if($authInfo !== null)
$this->authInfo->setInfo($this->usersCtx->getUser($authInfo->getId()));
} }
} }
} }

53
src/Auth/ChatAuth.php
View file

@ -1,53 +0,0 @@
<?php
namespace EEPROM\Auth;
use stdClass;
final class ChatAuth {
public static function attempt(string $endPoint, string $method, string $secret, string $cookie): stdClass {
if(!empty($cookie)) {
$signature = sprintf('verify#%s#%s#%s', $method, $cookie, $_SERVER['REMOTE_ADDR']);
$signature = hash_hmac('sha256', $signature, $secret);
$login = curl_init($endPoint);
curl_setopt_array($login, [
CURLOPT_AUTOREFERER => false,
CURLOPT_FAILONERROR => false,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_HEADER => false,
CURLOPT_POST => true,
CURLOPT_POSTFIELDS => http_build_query([
'method' => $method,
'token' => $cookie,
'ipaddr' => $_SERVER['REMOTE_ADDR'],
], '', '&', PHP_QUERY_RFC3986),
CURLOPT_RETURNTRANSFER => true,
CURLOPT_TCP_FASTOPEN => true,
CURLOPT_CONNECTTIMEOUT => 2,
CURLOPT_MAXREDIRS => 2,
CURLOPT_PROTOCOLS => CURLPROTO_HTTPS,
CURLOPT_TIMEOUT => 5,
CURLOPT_USERAGENT => 'EEPROM',
CURLOPT_HTTPHEADER => [
'Content-Type: application/x-www-form-urlencoded',
'X-SharpChat-Signature: ' . $signature,
],
]);
$userInfo = json_decode(curl_exec($login));
curl_close($login);
}
if(empty($userInfo->success)) {
$userInfo = new stdClass;
$userInfo->success = false;
$userInfo->user_id = 0;
$userInfo->username = 'Anonymous';
$userInfo->colour_raw = 0x40000000;
$userInfo->rank = 0;
$userInfo->hierarchy = 0;
$userInfo->perms = 0;
}
return $userInfo;
}
}

2
src/EEPROMContext.php
View file

@ -61,7 +61,7 @@ class EEPROMContext {
if($isApiDomain) { if($isApiDomain) {
$routingCtx->register(new Auth\AuthRoutes( $routingCtx->register(new Auth\AuthRoutes(
$this->config->scopeTo('misuzu'), $this->config->scopeTo('apii'),
$this->authInfo, $this->authInfo,
$this->usersCtx $this->usersCtx
)); ));