diff --git a/add_expense_modal.php b/add_expense_modal.php index 531b48f1..4e9fe367 100644 --- a/add_expense_modal.php +++ b/add_expense_modal.php @@ -75,7 +75,7 @@
-
Login
+
diff --git a/client_contacts.php b/client_contacts.php index 0d39b232..2e8a0695 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -32,10 +32,14 @@ ?> +
+ + + diff --git a/client_invoices.php b/client_invoices.php index b04a0f4d..bbca012d 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -1,6 +1,6 @@ @@ -19,6 +19,7 @@ Amount Date Due + Category Status Actions @@ -34,6 +35,7 @@ $invoice_due = $row['invoice_due']; $invoice_amount = $row['invoice_amount']; $invoice_category_id = $row['category_id']; + $category_name = $row['category_name']; $now = time(); if(($invoice_status == "Sent" or $invoice_status == "Partial") and strtotime($invoice_due) < $now ){ @@ -62,6 +64,7 @@ $
+ diff --git a/dashboard.php b/dashboard.php index 3da7bd84..4a862b08 100644 --- a/dashboard.php +++ b/dashboard.php @@ -28,8 +28,8 @@ $sql_total_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_ $row = mysqli_fetch_array($sql_total_expenses); $total_expenses = $row['total_expenses']; -//Total up all the -$sql_invoice_totals = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_totals FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND AND YEAR(invoice_date) = $year"); +//Total up all the Invoices that are not draft or cancelled +$sql_invoice_totals = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_totals FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled' AND YEAR(invoice_date) = $year"); $row = mysqli_fetch_array($sql_invoice_totals); $invoice_totals = $row['invoice_totals']; @@ -409,7 +409,7 @@ var myPieChart = new Chart(ctx, { datasets: [{ data: [
+
@@ -28,7 +29,7 @@
- +
diff --git a/edit_expense_modal.php b/edit_expense_modal.php index c14309c2..0140e927 100644 --- a/edit_expense_modal.php +++ b/edit_expense_modal.php @@ -73,7 +73,7 @@ +
+
+ +
+ +
- +
+
+ +
+ +
- +
+
+ +
+ +
diff --git a/vendor/otphp-10.0/.github/CONTRIBUTING.md b/vendor/otphp-10.0/.github/CONTRIBUTING.md new file mode 100644 index 00000000..871735ad --- /dev/null +++ b/vendor/otphp-10.0/.github/CONTRIBUTING.md @@ -0,0 +1,25 @@ +# Contributing + +First of all, **thank you** for contributing. + +Bugs or feature requests can be posted online on the GitHub issues section of the project. + +Few rules to ease code reviews and merges: + +- You MUST follow the [PSR-1](http://www.php-fig.org/psr/psr-1/), [PSR-2](http://www.php-fig.org/psr/psr-2/) and [PSR-4](http://www.php-fig.org/psr/psr-4/) coding standards. +- You MUST run the test suite. +- You MUST write (or update) unit tests when bugs are fixed or features are added. +- You SHOULD write documentation. + +We use [Git-Flow](http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/) to automate our git branching workflow. + +To contribute use [Pull Requests](https://help.github.com/articles/using-pull-requests), please, write commit messages that make sense, and rebase your branch before submitting your PR. + +May be asked to squash your commits too. This is used to "clean" your Pull Request before merging it, avoiding commits such as fix tests, fix 2, fix 3, etc. + +Run test suite +------------ + +* install composer: `curl -s http://getcomposer.org/installer | php` +* install dependencies: `php composer.phar install` +* run tests: `vendor/bin/phpunit` diff --git a/vendor/otphp-10.0/.github/ISSUE_TEMPLATE.md b/vendor/otphp-10.0/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..2ceb8da6 --- /dev/null +++ b/vendor/otphp-10.0/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,16 @@ +| Q | A +| -------------------- | ----- +| Bug report? | yes/no +| Feature request? | yes/no +| BC Break report? | yes/no +| RFC? / Specification | yes/no +| Library version | x.y(.z) + + diff --git a/vendor/otphp-10.0/.github/PULL_REQUEST_TEMPLATE.md b/vendor/otphp-10.0/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..acd0be9f --- /dev/null +++ b/vendor/otphp-10.0/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,21 @@ +| Q | A +| ------------- | --- +| Branch? | master +| Bug fix? | yes/no +| New feature? | yes/no +| BC breaks? | yes/no +| Deprecations? | yes/no +| Tests pass? | yes/no +| Fixed tickets | #... +| License | MIT +| Tests added | +| Doc PR | + + diff --git a/vendor/otphp-10.0/.php_cs.dist b/vendor/otphp-10.0/.php_cs.dist new file mode 100644 index 00000000..7410dff6 --- /dev/null +++ b/vendor/otphp-10.0/.php_cs.dist @@ -0,0 +1,61 @@ +in(__DIR__.'/src') + ->in(__DIR__.'/tests') +; + +return PhpCsFixer\Config::create() + ->setRules([ + '@PSR1' => true, + '@PSR2' => true, + '@Symfony' => true, + '@DoctrineAnnotation' => true, + '@PHP70Migration' => true, + '@PHP71Migration' => true, + 'strict_param' => true, + 'strict_comparison' => true, + 'array_syntax' => ['syntax' => 'short'], + 'array_indentation' => true, + 'ordered_imports' => true, + 'protected_to_private' => true, + 'declare_strict_types' => true, + 'native_function_invocation' => [ + 'include' => ['@compiler_optimized'], + 'scope' => 'namespaced', + ], + 'mb_str_functions' => true, + 'method_chaining_indentation' => true, + 'linebreak_after_opening_tag' => true, + 'combine_consecutive_issets' => true, + 'combine_consecutive_unsets' => true, + 'compact_nullable_typehint' => true, + 'no_superfluous_phpdoc_tags' => true, + 'no_superfluous_elseif' => true, + 'phpdoc_trim_consecutive_blank_line_separation' => true, + 'phpdoc_order' => true, + 'pow_to_exponentiation' => true, + 'simplified_null_return' => true, + 'header_comment' => [ + 'header' => $header, + ], + 'align_multiline_comment' => [ + 'comment_type' => 'all_multiline', + ], + 'php_unit_test_annotation' => [ + 'case' => 'snake', + 'style' => 'annotation', + ], + 'php_unit_test_case_static_method_calls' => true, + ]) + ->setRiskyAllowed(true) + ->setUsingCache(true) + ->setFinder($finder) + ; diff --git a/vendor/otphp-10.0/CODE_OF_CONDUCT.md b/vendor/otphp-10.0/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..4ec12c72 --- /dev/null +++ b/vendor/otphp-10.0/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@spomky-labs.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/vendor/otphp-10.0/LICENSE b/vendor/otphp-10.0/LICENSE new file mode 100644 index 00000000..e6a673e3 --- /dev/null +++ b/vendor/otphp-10.0/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014-2016 Florent Morselli + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/otphp-10.0/composer.json b/vendor/otphp-10.0/composer.json new file mode 100644 index 00000000..2b325741 --- /dev/null +++ b/vendor/otphp-10.0/composer.json @@ -0,0 +1,50 @@ +{ + "name": "spomky-labs/otphp", + "type": "library", + "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator", + "license": "MIT", + "keywords": ["otp", "hotp", "totp", "RFC 4226", "RFC 6238", "Google Authenticator", "FreeOTP"], + "homepage": "https://github.com/Spomky-Labs/otphp", + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/Spomky-Labs/otphp/contributors" + } + ], + "require": { + "php": "^7.2|^8.0", + "ext-mbstring": "*", + "paragonie/constant_time_encoding": "^2.0", + "beberlei/assert": "^3.0", + "thecodingmachine/safe": "^0.1.14" + }, + "require-dev": { + "phpunit/phpunit": "^8.0", + "php-coveralls/php-coveralls": "^2.0", + "phpstan/phpstan": "^0.11", + "phpstan/phpstan-beberlei-assert": "^0.11.0", + "phpstan/phpstan-deprecation-rules": "^0.11", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-strict-rules": "^0.11", + "thecodingmachine/phpstan-safe-rule": "^0.1.0" + }, + "suggest": { + }, + "autoload": { + "psr-4": { "OTPHP\\": "src/" } + }, + "autoload-dev": { + "psr-4": { "OTPHP\\Test\\": "tests/" } + }, + "extra": { + "branch-alias": { + "v10.0": "10.0.x-dev", + "v9.0": "9.0.x-dev", + "v8.3": "8.3.x-dev" + } + } +} diff --git a/vendor/otphp-10.0/phpstan.neon b/vendor/otphp-10.0/phpstan.neon new file mode 100644 index 00000000..c9be8962 --- /dev/null +++ b/vendor/otphp-10.0/phpstan.neon @@ -0,0 +1,13 @@ +parameters: + level: 7 + paths: + - src + - tests + ignoreErrors: + - '#Variable property access on \$this\(OTPHP\\OTP\)\.#' +includes: + - vendor/phpstan/phpstan-strict-rules/rules.neon + - vendor/phpstan/phpstan-phpunit/extension.neon + - vendor/phpstan/phpstan-deprecation-rules/rules.neon + - vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon + - vendor/phpstan/phpstan-beberlei-assert/extension.neon diff --git a/vendor/otphp-10.0/src/Factory.php b/vendor/otphp-10.0/src/Factory.php new file mode 100644 index 00000000..f5be85c0 --- /dev/null +++ b/vendor/otphp-10.0/src/Factory.php @@ -0,0 +1,103 @@ +getCode(), $throwable); + } + Assertion::isArray($parsed_url, 'Not a valid OTP provisioning URI'); + self::checkData($parsed_url); + + $otp = self::createOTP($parsed_url); + + self::populateOTP($otp, $parsed_url); + + return $otp; + } + + private static function populateParameters(OTPInterface &$otp, array $data): void + { + foreach ($data['query'] as $key => $value) { + $otp->setParameter($key, $value); + } + } + + private static function populateOTP(OTPInterface &$otp, array $data): void + { + self::populateParameters($otp, $data); + $result = explode(':', rawurldecode(mb_substr($data['path'], 1))); + + if (2 > \count($result)) { + $otp->setIssuerIncludedAsParameter(false); + + return; + } + + if (null !== $otp->getIssuer()) { + Assertion::eq($result[0], $otp->getIssuer(), 'Invalid OTP: invalid issuer in parameter'); + $otp->setIssuerIncludedAsParameter(true); + } + $otp->setIssuer($result[0]); + } + + private static function checkData(array &$data): void + { + foreach (['scheme', 'host', 'path', 'query'] as $key) { + Assertion::keyExists($data, $key, 'Not a valid OTP provisioning URI'); + } + Assertion::eq('otpauth', $data['scheme'], 'Not a valid OTP provisioning URI'); + parse_str($data['query'], $data['query']); + Assertion::keyExists($data['query'], 'secret', 'Not a valid OTP provisioning URI'); + } + + private static function createOTP(array $parsed_url): OTPInterface + { + switch ($parsed_url['host']) { + case 'totp': + $totp = TOTP::create($parsed_url['query']['secret']); + $totp->setLabel(self::getLabel($parsed_url['path'])); + + return $totp; + case 'hotp': + $hotp = HOTP::create($parsed_url['query']['secret']); + $hotp->setLabel(self::getLabel($parsed_url['path'])); + + return $hotp; + default: + throw new InvalidArgumentException(sprintf('Unsupported "%s" OTP type', $parsed_url['host'])); + } + } + + private static function getLabel(string $data): string + { + $result = explode(':', rawurldecode(mb_substr($data, 1))); + + return 2 === \count($result) ? $result[1] : $result[0]; + } +} diff --git a/vendor/otphp-10.0/src/FactoryInterface.php b/vendor/otphp-10.0/src/FactoryInterface.php new file mode 100644 index 00000000..00acc2d0 --- /dev/null +++ b/vendor/otphp-10.0/src/FactoryInterface.php @@ -0,0 +1,23 @@ +setCounter($counter); + } + + public static function create(?string $secret = null, int $counter = 0, string $digest = 'sha1', int $digits = 6): HOTPInterface + { + return new self($secret, $counter, $digest, $digits); + } + + protected function setCounter(int $counter): void + { + $this->setParameter('counter', $counter); + } + + public function getCounter(): int + { + return $this->getParameter('counter'); + } + + private function updateCounter(int $counter): void + { + $this->setCounter($counter); + } + + public function getProvisioningUri(): string + { + return $this->generateURI('hotp', ['counter' => $this->getCounter()]); + } + + /** + * If the counter is not provided, the OTP is verified at the actual counter. + */ + public function verify(string $otp, ?int $counter = null, ?int $window = null): bool + { + Assertion::greaterOrEqualThan($counter, 0, 'The counter must be at least 0.'); + + if (null === $counter) { + $counter = $this->getCounter(); + } elseif ($counter < $this->getCounter()) { + return false; + } + + return $this->verifyOtpWithWindow($otp, $counter, $window); + } + + private function getWindow(?int $window): int + { + return abs($window ?? 0); + } + + private function verifyOtpWithWindow(string $otp, int $counter, ?int $window): bool + { + $window = $this->getWindow($window); + + for ($i = $counter; $i <= $counter + $window; ++$i) { + if ($this->compareOTP($this->at($i), $otp)) { + $this->updateCounter($i + 1); + + return true; + } + } + + return false; + } + + protected function getParameterMap(): array + { + $v = array_merge( + parent::getParameterMap(), + ['counter' => function ($value) { + Assertion::greaterOrEqualThan((int) $value, 0, 'Counter must be at least 0.'); + + return (int) $value; + }] + ); + + return $v; + } +} diff --git a/vendor/otphp-10.0/src/HOTPInterface.php b/vendor/otphp-10.0/src/HOTPInterface.php new file mode 100644 index 00000000..336ce105 --- /dev/null +++ b/vendor/otphp-10.0/src/HOTPInterface.php @@ -0,0 +1,29 @@ +setSecret($secret); + $this->setDigest($digest); + $this->setDigits($digits); + } + + public function getQrCodeUri(string $uri, string $placeholder): string + { + $provisioning_uri = urlencode($this->getProvisioningUri()); + + return str_replace($placeholder, $provisioning_uri, $uri); + } + + /** + * The OTP at the specified input. + */ + protected function generateOTP(int $input): string + { + $hash = hash_hmac($this->getDigest(), $this->intToByteString($input), $this->getDecodedSecret()); + $hmac = []; + foreach (str_split($hash, 2) as $hex) { + $hmac[] = hexdec($hex); + } + $offset = $hmac[\count($hmac) - 1] & 0xF; + $code = ($hmac[$offset + 0] & 0x7F) << 24 | ($hmac[$offset + 1] & 0xFF) << 16 | ($hmac[$offset + 2] & 0xFF) << 8 | ($hmac[$offset + 3] & 0xFF); + $otp = $code % 10 ** $this->getDigits(); + + return str_pad((string) $otp, $this->getDigits(), '0', STR_PAD_LEFT); + } + + public function at(int $timestamp): string + { + return $this->generateOTP($timestamp); + } + + protected function filterOptions(array &$options): void + { + foreach (['algorithm' => 'sha1', 'period' => 30, 'digits' => 6] as $key => $default) { + if (isset($options[$key]) && $default === $options[$key]) { + unset($options[$key]); + } + } + + ksort($options); + } + + protected function generateURI(string $type, array $options): string + { + $label = $this->getLabel(); + Assertion::string($label, 'The label is not set.'); + Assertion::false($this->hasColon($label), 'Label must not contain a colon.'); + $options = array_merge($options, $this->getParameters()); + $this->filterOptions($options); + $params = str_replace(['+', '%7E'], ['%20', '~'], http_build_query($options)); + + return sprintf('otpauth://%s/%s?%s', $type, rawurlencode((null !== $this->getIssuer() ? $this->getIssuer().':' : '').$label), $params); + } + + private function getDecodedSecret(): string + { + try { + $secret = Base32::decodeUpper($this->getSecret()); + } catch (\Exception $e) { + throw new RuntimeException('Unable to decode the secret. Is it correctly base32 encoded?'); + } + + return $secret; + } + + private function intToByteString(int $int): string + { + $result = []; + while (0 !== $int) { + $result[] = \chr($int & 0xFF); + $int >>= 8; + } + + return str_pad(implode(array_reverse($result)), 8, "\000", STR_PAD_LEFT); + } + + protected function compareOTP(string $safe, string $user): bool + { + return hash_equals($safe, $user); + } +} diff --git a/vendor/otphp-10.0/src/OTPInterface.php b/vendor/otphp-10.0/src/OTPInterface.php new file mode 100644 index 00000000..40dfd5bc --- /dev/null +++ b/vendor/otphp-10.0/src/OTPInterface.php @@ -0,0 +1,94 @@ +parameters; + + if (null !== $this->getIssuer() && true === $this->isIssuerIncludedAsParameter()) { + $parameters['issuer'] = $this->getIssuer(); + } + + return $parameters; + } + + public function getSecret(): string + { + return $this->getParameter('secret'); + } + + private function setSecret(?string $secret): void + { + $this->setParameter('secret', $secret); + } + + public function getLabel(): ?string + { + return $this->label; + } + + public function setLabel(string $label): void + { + $this->setParameter('label', $label); + } + + public function getIssuer(): ?string + { + return $this->issuer; + } + + public function setIssuer(string $issuer): void + { + $this->setParameter('issuer', $issuer); + } + + public function isIssuerIncludedAsParameter(): bool + { + return $this->issuer_included_as_parameter; + } + + public function setIssuerIncludedAsParameter(bool $issuer_included_as_parameter): void + { + $this->issuer_included_as_parameter = $issuer_included_as_parameter; + } + + public function getDigits(): int + { + return $this->getParameter('digits'); + } + + private function setDigits(int $digits): void + { + $this->setParameter('digits', $digits); + } + + public function getDigest(): string + { + return $this->getParameter('algorithm'); + } + + private function setDigest(string $digest): void + { + $this->setParameter('algorithm', $digest); + } + + public function hasParameter(string $parameter): bool + { + return \array_key_exists($parameter, $this->parameters); + } + + public function getParameter(string $parameter) + { + if ($this->hasParameter($parameter)) { + return $this->getParameters()[$parameter]; + } + + throw new InvalidArgumentException(sprintf('Parameter "%s" does not exist', $parameter)); + } + + public function setParameter(string $parameter, $value): void + { + $map = $this->getParameterMap(); + + if (true === \array_key_exists($parameter, $map)) { + $callback = $map[$parameter]; + $value = $callback($value); + } + + if (property_exists($this, $parameter)) { + $this->$parameter = $value; + } else { + $this->parameters[$parameter] = $value; + } + } + + protected function getParameterMap(): array + { + return [ + 'label' => function ($value) { + Assertion::false($this->hasColon($value), 'Label must not contain a colon.'); + + return $value; + }, + 'secret' => function ($value) { + if (null === $value) { + $value = Base32::encodeUpper(random_bytes(64)); + } + $value = trim(mb_strtoupper($value), '='); + + return $value; + }, + 'algorithm' => function ($value) { + $value = mb_strtolower($value); + Assertion::inArray($value, hash_algos(), sprintf('The "%s" digest is not supported.', $value)); + + return $value; + }, + 'digits' => function ($value) { + Assertion::greaterThan($value, 0, 'Digits must be at least 1.'); + + return (int) $value; + }, + 'issuer' => function ($value) { + Assertion::false($this->hasColon($value), 'Issuer must not contain a colon.'); + + return $value; + }, + ]; + } + + private function hasColon(string $value): bool + { + $colons = [':', '%3A', '%3a']; + foreach ($colons as $colon) { + if (false !== mb_strpos($value, $colon)) { + return true; + } + } + + return false; + } +} diff --git a/vendor/otphp-10.0/src/TOTP.php b/vendor/otphp-10.0/src/TOTP.php new file mode 100644 index 00000000..9c0db826 --- /dev/null +++ b/vendor/otphp-10.0/src/TOTP.php @@ -0,0 +1,153 @@ +setPeriod($period); + $this->setEpoch($epoch); + } + + public static function create(?string $secret = null, int $period = 30, string $digest = 'sha1', int $digits = 6, int $epoch = 0): TOTPInterface + { + return new self($secret, $period, $digest, $digits, $epoch); + } + + protected function setPeriod(int $period): void + { + $this->setParameter('period', $period); + } + + public function getPeriod(): int + { + return $this->getParameter('period'); + } + + private function setEpoch(int $epoch): void + { + $this->setParameter('epoch', $epoch); + } + + public function getEpoch(): int + { + return $this->getParameter('epoch'); + } + + public function at(int $timestamp): string + { + return $this->generateOTP($this->timecode($timestamp)); + } + + public function now(): string + { + return $this->at(time()); + } + + /** + * If no timestamp is provided, the OTP is verified at the actual timestamp. + */ + public function verify(string $otp, ?int $timestamp = null, ?int $window = null): bool + { + $timestamp = $this->getTimestamp($timestamp); + + if (null === $window) { + return $this->compareOTP($this->at($timestamp), $otp); + } + + return $this->verifyOtpWithWindow($otp, $timestamp, $window); + } + + private function verifyOtpWithWindow(string $otp, int $timestamp, int $window): bool + { + $window = abs($window); + + for ($i = 0; $i <= $window; ++$i) { + $next = $i * $this->getPeriod() + $timestamp; + $previous = -$i * $this->getPeriod() + $timestamp; + $valid = $this->compareOTP($this->at($next), $otp) || + $this->compareOTP($this->at($previous), $otp); + + if ($valid) { + return true; + } + } + + return false; + } + + private function getTimestamp(?int $timestamp): int + { + $timestamp = $timestamp ?? time(); + Assertion::greaterOrEqualThan($timestamp, 0, 'Timestamp must be at least 0.'); + + return $timestamp; + } + + public function getProvisioningUri(): string + { + $params = []; + if (30 !== $this->getPeriod()) { + $params['period'] = $this->getPeriod(); + } + + if (0 !== $this->getEpoch()) { + $params['epoch'] = $this->getEpoch(); + } + + return $this->generateURI('totp', $params); + } + + private function timecode(int $timestamp): int + { + return (int) floor(($timestamp - $this->getEpoch()) / $this->getPeriod()); + } + + protected function getParameterMap(): array + { + $v = array_merge( + parent::getParameterMap(), + [ + 'period' => function ($value) { + Assertion::greaterThan((int) $value, 0, 'Period must be at least 1.'); + + return (int) $value; + }, + 'epoch' => function ($value) { + Assertion::greaterOrEqualThan((int) $value, 0, 'Epoch must be greater than or equal to 0.'); + + return (int) $value; + }, + ] + ); + + return $v; + } + + protected function filterOptions(array &$options): void + { + parent::filterOptions($options); + + if (isset($options['epoch']) && 0 === $options['epoch']) { + unset($options['epoch']); + } + + ksort($options); + } +} diff --git a/vendor/otphp-10.0/src/TOTPInterface.php b/vendor/otphp-10.0/src/TOTPInterface.php new file mode 100644 index 00000000..a19fe7c0 --- /dev/null +++ b/vendor/otphp-10.0/src/TOTPInterface.php @@ -0,0 +1,36 @@ +