diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
new file mode 100644
index 0000000..7c335d1
--- /dev/null
+++ b/.idea/dictionaries/project.xml
@@ -0,0 +1,7 @@
+
+
+
+ liteauth
+
+
+
\ No newline at end of file
diff --git a/.idea/editor.xml b/.idea/editor.xml
new file mode 100644
index 0000000..8d0e15e
--- /dev/null
+++ b/.idea/editor.xml
@@ -0,0 +1,345 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..d858eb1
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..46ebd25
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+ "files.exclude": {
+ "**/*.rpyc": true,
+ "**/*.rpa": true,
+ "**/*.rpymc": true,
+ "**/cache/": true
+ }
+}
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..496acdb
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,675 @@
+# GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+## Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+- a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+- b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under
+ section 7. This requirement modifies the requirement in section 4
+ to "keep intact all notices".
+- c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+- d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+- a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+- b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the Corresponding
+ Source from a network server at no charge.
+- c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+- d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+- e) Convey the object code using peer-to-peer transmission,
+ provided you inform other peers where the object code and
+ Corresponding Source of the work are being offered to the general
+ public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+- a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+- b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+- c) Prohibiting misrepresentation of the origin of that material,
+ or requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+- d) Limiting the use for publicity purposes of names of licensors
+ or authors of the material; or
+- e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+- f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions
+ of it) with contractual assumptions of liability to the recipient,
+ for any liability that these contractual assumptions directly
+ impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see .
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read .
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..3b8ac4b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+# liteauth-firmware32
+
+## Pin Layout
+
+(Originally for the 30-pin ESP32 NodeMCU board)
+
+- **NFC Sensor** (SPI mode)
+ - GND to GND
+ - VCC to 3V3
+ - SCK to D25
+ - MISO to D15
+ - MOSI to D26
+ - SS to D27
+- Buzzer, D13 to Positive
diff --git a/liteauthAPI/.gitignore b/liteauthAPI/.gitignore
new file mode 100644
index 0000000..e19311f
--- /dev/null
+++ b/liteauthAPI/.gitignore
@@ -0,0 +1,9 @@
+# Secrets
+.env*
+
+# Dependencies
+node_modules
+
+# OS files
+.DS_Store
+Thumbs.db
\ No newline at end of file
diff --git a/liteauthAPI/New Entry.yml b/liteauthAPI/New Entry.yml
new file mode 100644
index 0000000..dd5e06d
--- /dev/null
+++ b/liteauthAPI/New Entry.yml
@@ -0,0 +1,15 @@
+info:
+ name: New Entry
+ type: http
+ seq: 1
+
+http:
+ method: GET
+ url: https://liteauth.local/api/newEntry
+ auth: inherit
+
+settings:
+ encodeUrl: true
+ timeout: 0
+ followRedirects: true
+ maxRedirects: 5
diff --git a/liteauthAPI/opencollection.yml b/liteauthAPI/opencollection.yml
new file mode 100644
index 0000000..d337b79
--- /dev/null
+++ b/liteauthAPI/opencollection.yml
@@ -0,0 +1,26 @@
+opencollection: 1.0.0
+
+info:
+ name: liteauth API
+config:
+ proxy:
+ inherit: true
+ config:
+ protocol: http
+ hostname: ""
+ port: ""
+ auth:
+ username: ""
+ password: ""
+ bypassProxy: ""
+
+request:
+ auth:
+ type: bearer
+ token: FAaMf8PeCUdFbp0i
+bundled: false
+extensions:
+ bruno:
+ ignore:
+ - node_modules
+ - .git
diff --git a/platformio.ini b/platformio.ini
index f7a08f4..eebfded 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -12,5 +12,11 @@
platform = espressif32
board = nodemcu-32s
framework = arduino
+build_flags =
+ -std=gnu++17
+ -DHTTPS_DISABLE_SELFSIGNING
+build_unflags = -std=gnu++11
board_build.filesystem = littlefs
-lib_deps = fhessel/esp32_https_server@^1.0.0
+lib_deps =
+ https://github.com/jasenk2/esp32_https_server.git#esp_tls
+ adafruit/Adafruit PN532@^1.3.4
diff --git a/src/FileUtils.h b/src/FileUtils.h
index 4c2e10b..d505af7 100644
--- a/src/FileUtils.h
+++ b/src/FileUtils.h
@@ -1,6 +1,27 @@
+#pragma once
#include
-void writeFile(const char *path, String message)
+inline void writeFile(const char *path, const String &message)
+{
+ File file = LittleFS.open(path, "w");
+ if (!file)
+ {
+ Serial.println("Failed to open file for writing");
+ }
+
+ if (file.print(message))
+ {
+ Serial.printf("File %s written.\n", path);
+ }
+ else
+ {
+ Serial.printf("Writing to file %s failed\n", path);
+ }
+ delay(1000);
+ file.close();
+}
+
+inline void writeFile(const char *path, const char* message)
{
File file = LittleFS.open(path, "w");
if (!file)
diff --git a/src/HttpApi.cpp b/src/HttpApi.cpp
new file mode 100644
index 0000000..e26ec27
--- /dev/null
+++ b/src/HttpApi.cpp
@@ -0,0 +1,167 @@
+#include
+#include
+
+#include "cert.h"
+#include "FileUtils.h"
+#include "NFC.h"
+#include "private_key.h"
+
+auto charSet = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+auto initial_setup = "/initial.txt";
+bool token_retrieved = false;
+
+std::string HttpApi::sessionToken;
+
+void restart(HTTPRequest *req, HTTPResponse *res)
+{
+ if (!HttpApi::checkHeader(req, res))
+ return;
+
+ res->setStatusCode(200);
+ ESP.restart();
+}
+
+void logs(HTTPRequest *req, HTTPResponse *res)
+{
+ if (!HttpApi::checkHeader(req, res))
+ return;
+
+ res->setHeader("Content-Type", "application/json");
+ res->print('[');
+ for (size_t i = 0; i < log_entries.size(); i++) {
+ if (i > 0) {
+ res->print(",");
+ }
+ res->print(R"({"time":")");
+ res->print(log_entries[i].datetime.c_str());
+ res->print(R"(","uid":")");
+ res->print(log_entries[i].uid.c_str());
+ res->print("\"}");
+ }
+ res->print(']');
+}
+
+void factoryReset(HTTPRequest *req, HTTPResponse *res)
+{
+ if (!HttpApi::checkHeader(req, res))
+ return;
+
+ res->setStatusCode(200);
+ res->finalize();
+ LittleFS.format();
+ ESP.restart();
+}
+
+void handleRoot(HTTPRequest *req, HTTPResponse *res)
+{
+ res->setHeader("Content-Type", "text/plain");
+ res->println("Your liteauth web server is working!\n");
+}
+
+void status(HTTPRequest *req, HTTPResponse *res)
+{
+ res->setHeader("Content-Type", "application/json");
+ res->print("{\"nfc\":");
+ res->print(nfc_status ? "true" : "false");
+ res->print("}");
+}
+
+const auto sampleId = std::string("01020304");
+
+void newEntry(HTTPRequest *req, HTTPResponse *res) {
+ if (!HttpApi::checkHeader(req, res))
+ return;
+
+ appendLog(&sampleId);
+ res->print("OK");
+}
+
+void getTokenRoute(HTTPRequest *req, HTTPResponse *res) {
+ if (token_retrieved) {
+ res->setStatusCode(403);
+ return;
+ }
+
+ res->setHeader("Content-Type", "text/plain");
+ res->print(HttpApi::getToken().c_str());
+ token_retrieved = true;
+ writeFile(initial_setup, "true");
+}
+
+HttpApi::HttpApi()
+{
+ if (File file = LittleFS.open(initial_setup, "r"); file) {
+ token_retrieved = true;
+ file.close();
+ }
+
+ cert = std::make_unique(
+ projectCert_der, projectCert_der_len,
+ projectKey_der, projectKey_der_len);
+ server = std::make_unique(cert.get());
+
+ const auto nodeRoot = new ResourceNode("/", "GET", handleRoot);
+ const auto statusNode = new ResourceNode("/api/status", "GET", status);
+ const auto restartNode = new ResourceNode("/api/restart", "GET", restart);
+ const auto resetNode = new ResourceNode("/api/factoryReset", "GET", factoryReset);
+ const auto logsNode = new ResourceNode("/api/logs", "GET", logs);
+ const auto getTokenNode = new ResourceNode("/api/getToken", "GET", getTokenRoute);
+ const auto newEntryNode = new ResourceNode("/api/newEntry", "GET", newEntry);
+
+ server->registerNode(nodeRoot);
+ fallbackServer.registerNode(nodeRoot);
+
+ server->registerNode(statusNode);
+ fallbackServer.registerNode(statusNode);
+
+ server->registerNode(restartNode);
+ server->registerNode(resetNode);
+ server->registerNode(logsNode);
+ server->registerNode(getTokenNode);
+ server->registerNode(newEntryNode);
+}
+
+bool HttpApi::checkHeader(HTTPRequest *req, HTTPResponse *res)
+{
+ const auto auth = req->getHeader("Authorization");
+
+ std::string bearer = "Bearer ";
+ bearer.append(sessionToken);
+
+ if (auth != bearer)
+ {
+ res->setHeader("Content-Type", "text/plain");
+ res->setStatusCode(403);
+ res->println("Unauthorized");
+ }
+
+ return auth == bearer;
+}
+
+auto tokenFile = "/token.txt";
+
+std::string HttpApi::getToken()
+{
+ File file = LittleFS.open(tokenFile, "r");
+ std::string token;
+
+ if (file) {
+ token = std::string(file.readString().c_str());
+ file.close();
+ sessionToken = token;
+ return sessionToken;
+ }
+
+ token.reserve(tokenLength);
+
+ for (uint8_t i = 0; i < tokenLength; i++)
+ {
+ token.push_back(charSet[random(0, static_cast(strlen(charSet)) - 1)]);
+ }
+
+ sessionToken = token;
+
+ writeFile(tokenFile, sessionToken.c_str());
+
+ return sessionToken;
+}
diff --git a/src/HttpApi.h b/src/HttpApi.h
index fb1221b..2a2ab19 100644
--- a/src/HttpApi.h
+++ b/src/HttpApi.h
@@ -1,71 +1,25 @@
+#pragma once
#include
+#include
using namespace httpsserver;
-std::string sessionToken;
-
-bool checkHeader(HTTPRequest *req)
+class HttpApi
{
- auto auth = req->getHeader("Authorization");
+public:
+ static std::string getToken();
- std::string bearer = "Bearer ";
- bearer.append(sessionToken);
+ HttpApi();
- return auth == bearer;
-}
+ static bool checkHeader(HTTPRequest *req, HTTPResponse *res);
-void restart(HTTPRequest *req, HTTPResponse *res)
-{
- if (!checkHeader(req))
- {
- res->setStatusCode(403);
- return;
- }
+ std::unique_ptr server;
- res->setStatusCode(200);
- ESP.restart();
-}
+ HTTPServer fallbackServer = HTTPServer();
-void logs(HTTPRequest *req, HTTPResponse *res)
-{
- if (!checkHeader(req))
- {
- res->setStatusCode(403);
- return;
- }
+private:
+ static std::string sessionToken;
+ std::unique_ptr cert;
+};
- res->setHeader("Content-Type", "application/json");
- res->println("[]");
-}
-
-uint32_t getRandom()
-{
- return *(volatile uint32_t *)0x3FF20E44;
-}
-
-const char *charSet = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-const uint8_t tokenLength = 16;
-
-std::string getToken()
-{
- Serial.println(sizeof(charSet));
- std::string token;
- token.reserve(tokenLength);
-
- for (uint8_t i = 0; i < tokenLength; i++)
- {
- token.push_back(charSet[random(0, sizeof(charSet) - 1)]);
- }
-
- sessionToken = token;
- return sessionToken;
-}
-
-void setupApi(HTTPSServer *server)
-{
- ResourceNode *restartNode = new ResourceNode("/api/restart", "GET", restart);
- ResourceNode *logsNode = new ResourceNode("/api/logs", "GET", logs);
-
- server->registerNode(restartNode);
- server->registerNode(logsNode);
-}
+constexpr uint8_t tokenLength = 16;
\ No newline at end of file
diff --git a/src/HttpData.h b/src/HttpData.h
deleted file mode 100644
index d76dea5..0000000
--- a/src/HttpData.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#include
-
-const char *server_cert PROGMEM = R"EOF(
------BEGIN CERTIFICATE-----
-MIIEJzCCAw+gAwIBAgIUFdkVCFw9RTqLgFY3gH1ok1qWYhowDQYJKoZIhvcNAQEL
-BQAwgZkxCzAJBgNVBAYTAlRIMRIwEAYDVQQIDAlOb25nLUtoYWkxFzAVBgNVBAoM
-DlRyYXNoYmluIEdhbWVzMRQwEgYDVQQLDAtJb1QgRGV2aWNlczEaMBgGA1UEAwwR
-bGl0ZWF1dGggTG9jYWwgQ0ExKzApBgkqhkiG9w0BCQEWHGxpbmVzb2Zjb2Rlc0Bk
-YWlsaXRhdGlvbi54eXowHhcNMjUxMTA5MDgxNzUxWhcNMjYxMTA5MDgxNzUxWjCB
-ljELMAkGA1UEBhMCVEgxEjAQBgNVBAgMCU5vbmctS2hhaTEXMBUGA1UECgwOVHJh
-c2hiaW4gR2FtZXMxFDASBgNVBAsMC0lvVCBEZXZpY2VzMRcwFQYDVQQDDA5saXRl
-YXV0aC5sb2NhbDErMCkGCSqGSIb3DQEJARYcbGluZXNvZmNvZGVzQGRhaWxpdGF0
-aW9uLnh5ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+nuEe+u475
-6WOzrNL/4sdjwxTlRfIQ2yTrhQE3iVvryzzt8agleyB3+B9/PlNw68t8pg7PCmPI
-RhDbrP1qFfU1rYsOuS0NWzABB35hJG1NbHxvUnu5K3EEibIA4pSRn3l0EMOe6oeX
-8IdRg0Wl2iXckDGBXzPWxWQAPkzB3toLIG8jGtjoyJ0lzPkxdpXBo3TZZuZnIXU3
-B86Ejhk0iFcoO9Jz3BQKsvA1NtG9aicEsJTHu2lkqSNDK6JlEYRfH12C8ANNwTBf
-yLLmmE1VmvzorzJOrw/NCRVMAvM7CiiHPQHrgpB563ijCxG+TOh0rQTkosSxMG+t
-XPpk/sw1vZECAwEAAaNoMGYwHwYDVR0jBBgwFoAUGIiWaK06C0piayKrZ8nGLZ6S
-/3QwCQYDVR0TBAIwADAZBgNVHREEEjAQgg5saXRlYXV0aC5sb2NhbDAdBgNVHQ4E
-FgQU78QuM1qvnifVMfFpz27jzPRS4DUwDQYJKoZIhvcNAQELBQADggEBADJKAZXm
-i/P2U/BFZh66etw4siM3uVXtIuoL4+wSVNZgb2yOpLGk0FRWvuuIJ4SxMtlsva5/
-+5p3O/y3tMAcylVj+kn6h7V5/6/RhNYb8BbmIDMViBxkPqEu7CPnfrtVSwcIXJ44
-P35t6dFuc1W21JL3yNf2EkB32DAt+smjHDKV6izmTovGcbkeTMf/TUJv7J4bnp52
-UhRZob0cQbb1HdDmZ6HTauJxzixKxUk043s1Sq8j+pvMVaqDVfapoqqPxSv+ml/j
-Vu/h/ewarRvnSjFloPFSgyeQjwS3TpA08ppdIuAcF589q5fW+IoG8jmFSetZnr55
-z0xONgWPCvoS4aA=
------END CERTIFICATE-----
-)EOF";
-
-const char *server_private_key PROGMEM = R"EOF(
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDfp7hHvruO+elj
-s6zS/+LHY8MU5UXyENsk64UBN4lb68s87fGoJXsgd/gffz5TcOvLfKYOzwpjyEYQ
-26z9ahX1Na2LDrktDVswAQd+YSRtTWx8b1J7uStxBImyAOKUkZ95dBDDnuqHl/CH
-UYNFpdol3JAxgV8z1sVkAD5Mwd7aCyBvIxrY6MidJcz5MXaVwaN02WbmZyF1NwfO
-hI4ZNIhXKDvSc9wUCrLwNTbRvWonBLCUx7tpZKkjQyuiZRGEXx9dgvADTcEwX8iy
-5phNVZr86K8yTq8PzQkVTALzOwoohz0B64KQeet4owsRvkzodK0E5KLEsTBvrVz6
-ZP7MNb2RAgMBAAECggEAE0i4FjGPJPcN5VuY53GKSXRj3fGd3A8RgievhmkWNh+I
-3NZMW5ntuaE2eurDAjlOj3NOMyEtbWiXh/0U9521yniIH+ETXNvVtLgmAALau/Ts
-yXbkxweyg/Jm9/rlDnfW5wc3qdJSOQJECjrgRXlVK6YOpcIYphTa3LI7rO0bbLPX
-Gp/IDFUFYCbQXqQ3TiAG00F+m5/7XxEQdq5y/cssJR8mdyeBKV6q+iwcbfUx7w/q
-eXZVK2kNRjEYuN+Mmq/ccHtN3Px5jmocqzewwpRmc3T7ml5tN1mTSSkhNDIs8sEg
-l3KrpNJSA83/uwwUkdsHFPfdqsjwyoPUseSkNlArMQKBgQD48AYjYxhI6a47UhbC
-+g9gGycHAtH9gpjGDfTc/P3BeN957Xruh91/zUUwUqtFfqj7m6qEoIPD9J1ohBpR
-ZRnrfMCXwmZ74LseElCnCHWZM+5XNYqfOXx4UVt55UydUV7nF5QZR1yGSzbYOk3Y
-nI0Vo1IGEYBNqJAUZGBg2UdXaQKBgQDmABNMPbD7DiUr/kPIfTQGygYxT7UIzwBF
-I4rkpL2afcYew7ts1YUKDaEohxWAJe+FHYByIgPOAniNjzMAQvLVstr/OtnzFBtE
-k7nQDJbXDw3vUeD+6j8YQhSO1qqQojGvvOmf97G/6kVFEBmivz5W5x5+Fyj6Fqxs
-Jo4+sy7X6QKBgAuAa4gvB+w2f8pV3J9dlmBGYOM+Ch3AbvaXpnyfY8oQn6KuikOD
-G4TQIyY8a5VmaMBXTOWb1Pq0zqEJmX2xQiVTOkLIxJtsoric+AT/qw9NCvIUkzcQ
-HOQiPiu/oG6UV+ItgLY6SdgamYocB4S+lvYs+Zk2Lctowl9u09UltNohAoGAVxkc
-Nbj+9nOq2/gTzy6qrw9+PNpEYiuRnJ0TEfbY3lJW3nuc1GAfW2lB6EkPeVHkXHKJ
-m68J5c/Fu0XJOIYh049Bo3mz43tvwA55RTIfRR2sVz6Yh7BJaHRNuLHOMataSYSu
-rCduppCe3sJ0Es99Wgd34qP+noZLkUEgiNnuGVECgYBrF3pJ+XZT57Izm/MyMIg5
-6QljF0y3uNtldLXY9lB09b+TCXfanKkODGRdWqygiHVayNz1ZWhqQfHt0sAqYs+H
-Xm8rfg/JVgFoy9+51zBj5F+ft/7N/9ppGaxC6P7Np+yQTv6uwYNyGtWOhKORUcPR
-JkzV1/dXVBSKdgGu4B3w3g==
------END PRIVATE KEY-----
-)EOF";
diff --git a/src/NFC.h b/src/NFC.h
new file mode 100644
index 0000000..7c5dfb0
--- /dev/null
+++ b/src/NFC.h
@@ -0,0 +1,137 @@
+#pragma once
+#include
+#include
+#include
+#include
+#include
+#include
+
+inline Adafruit_PN532 nfc(25, 15, 26, 27);
+
+#define BUZZER 13
+
+struct LogEntry {
+ const std::string datetime;
+ const std::string uid;
+};
+
+inline auto log_file = "/logs.txt";
+inline bool nfc_status = false;
+inline std::unordered_set ids = {};
+inline std::vector log_entries = {};
+
+inline std::string getTime() {
+ tm timeInfo{};
+
+ if (getLocalTime(&timeInfo)) {
+ char timeStringBuf[21];
+ strftime(timeStringBuf, sizeof(timeStringBuf), "%FT%TZ", &timeInfo);
+ return timeStringBuf;
+ }
+
+ return "";
+}
+
+/// @brief Setups the NFC sensor
+/// @return True on success, otherwise false
+inline bool setupNfc()
+{
+ nfc.begin();
+ if (!nfc.getFirmwareVersion())
+ {
+ Serial.println("Can't find the PN532 board!");
+ return false;
+ }
+ nfc_status = true;
+
+ nfc.SAMConfig();
+ nfc.setPassiveActivationRetries(0x64);
+ Serial.println("NFC sensors initialized.");
+
+ if (LittleFS.exists(log_file)) {
+ File f = LittleFS.open(log_file, "r");
+
+ while (f.available()) {
+ String line = f.readStringUntil('\n');
+ LogEntry entry{
+ .datetime = std::string(line.substring(0, 20).c_str()),
+ .uid = std::string(line.substring(21, line.length() - 2).c_str())};
+ log_entries.push_back(entry);
+ }
+
+ f.close();
+ } else {
+ writeFile(log_file, "");
+ }
+
+ return true;
+}
+
+inline void buzzerTune(uint8_t pin, unsigned int freq = 2000)
+{
+ tone(pin, freq);
+ delay(100);
+ noTone(pin);
+}
+
+inline void checkDevice(const std::string &uid) {
+ const auto id = ids.find(uid);
+
+ if (id == ids.end()) {
+ buzzerTune(BUZZER, 1250);
+ delay(500);
+ buzzerTune(BUZZER, 1250);
+ return;
+ }
+
+ buzzerTune(BUZZER, 2000);
+ Serial.println(id->c_str());
+}
+
+
+inline std::string readNfc(Adafruit_PN532 *dev, const char *name, const uint16_t timeout)
+{
+ uint8_t uidLength;
+ uint8_t uid[] = {0};
+
+ if (!dev->readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, timeout))
+ return "";
+
+ std::ostringstream oss;
+ oss << std::hex << std::setfill('0');
+
+ for (uint8_t i = 0; i < uidLength; i++)
+ {
+ oss << std::setw(2) << static_cast(uid[i]);
+ }
+
+ return oss.str();
+}
+
+inline void appendLog(const std::string* uid) {
+ const std::string time = getTime();
+ const LogEntry entry{
+ .datetime = time,
+ .uid = *uid};
+ log_entries.push_back(entry);
+
+ timeval tv{};
+ // ReSharper disable once CppZeroConstantCanBeReplacedWithNullptr
+ gettimeofday(&tv, NULL); // NOLINT(*-use-nullptr)
+ Serial.println(entry.datetime.c_str());
+ Serial.println(tv.tv_usec / 1000L);
+
+ File f = LittleFS.open(log_file, FILE_APPEND);
+ f.print(time.c_str());
+ f.print(" ");
+ f.println(uid->c_str());
+ f.close();
+}
+
+inline void handleNfc()
+{
+ if (const auto uid = readNfc(&nfc, "exit", 3000); !uid.empty()) {
+ buzzerTune(BUZZER);
+ appendLog(&uid);
+ }
+}
diff --git a/src/WiFiUtils.cpp b/src/WiFiUtils.cpp
new file mode 100644
index 0000000..0b06f1c
--- /dev/null
+++ b/src/WiFiUtils.cpp
@@ -0,0 +1,111 @@
+#include
+
+auto wifiInfo = "/wifi.conf";
+
+const char *getStatusMessage(wl_status_t status)
+{
+ switch (status)
+ {
+ case WL_NO_SHIELD:
+ return "No Arduino Shield";
+ case WL_IDLE_STATUS:
+ return "Idle";
+ case WL_NO_SSID_AVAIL:
+ return "No SSID available";
+ case WL_SCAN_COMPLETED:
+ return "Scan completed";
+ case WL_CONNECTED:
+ return "Connected";
+ case WL_CONNECT_FAILED:
+ return "Connection failed";
+ case WL_CONNECTION_LOST:
+ return "Connection lost";
+ case WL_DISCONNECTED:
+ return "Disconnected";
+ }
+
+ return "";
+}
+
+void wifiSmartConfig()
+{
+ WiFi.beginSmartConfig();
+
+ // Wait for SmartConfig packet from mobile
+ Serial.println("Waiting for SmartConfig.");
+ while (!WiFi.smartConfigDone())
+ {
+ delay(500);
+ Serial.print(".");
+ }
+
+ Serial.println("");
+ Serial.println("SmartConfig received.");
+
+ // Wait for Wi-Fi to connect to AP
+ Serial.println("Waiting for Wi-Fi");
+ while (WiFiClass::status() != WL_CONNECTED)
+ {
+ delay(500);
+ Serial.print(".");
+ }
+
+ Serial.println("Wi-Fi Connected.");
+
+ Serial.print("IP Address: ");
+ Serial.println(WiFi.localIP());
+
+ Serial.println("Saving network information to LittleFS...");
+
+ String ssid = WiFi.SSID();
+ String content = String(ssid);
+ String pass = WiFi.psk();
+
+ content.concat("\n");
+ content.concat(pass);
+
+ writeFile("/wifi.conf", content);
+}
+
+bool trySavedWiFi()
+{
+ File file = LittleFS.open(wifiInfo, "r");
+
+ if (!file)
+ {
+ return false;
+ }
+
+ String ssid = file.readStringUntil('\n');
+ String pass = file.readString();
+ file.close();
+
+ Serial.println("Saved SSID:");
+ Serial.println(ssid);
+
+ Serial.println("Trying to connect to saved Wi-Fi... (Waiting for 6 seconds)");
+
+ WiFi.begin(ssid, pass);
+
+ delay(6000);
+ const auto status = WiFiClass::status();
+ Serial.printf("Wi-Fi Status: %d (%s)\n", status, getStatusMessage(status));
+
+ return WiFiClass::status() == WL_CONNECTED;
+}
+
+void initWiFi()
+{
+ // Init Wi-Fi as Station, start SmartConfig
+ WiFiClass::mode(WIFI_STA);
+ delay(500);
+
+ if (trySavedWiFi())
+ {
+ Serial.print("IP Address: ");
+ Serial.println(WiFi.localIP());
+ return;
+ }
+
+ wifiSmartConfig();
+}
diff --git a/src/WiFiUtils.h b/src/WiFiUtils.h
index 2a92a5c..ddbd4fc 100644
--- a/src/WiFiUtils.h
+++ b/src/WiFiUtils.h
@@ -1,117 +1,14 @@
+#pragma once
#include
#include
#include
-const char *wifiInfo = "/wifi.conf";
+const char *getStatusMessage(wl_status_t status);
-const char *getStatusMessage(wl_status_t status)
-{
- switch (status)
- {
- case WL_NO_SHIELD:
- return "No Arduino Shield";
- case WL_IDLE_STATUS:
- return "Idle";
- case WL_NO_SSID_AVAIL:
- return "No SSID available";
- case WL_SCAN_COMPLETED:
- return "Scan completed";
- case WL_CONNECTED:
- return "Connected";
- case WL_CONNECT_FAILED:
- return "Connection failed";
- case WL_CONNECTION_LOST:
- return "Connection lost";
- case WL_DISCONNECTED:
- return "Disconnected";
- }
+void wifiSmartConfig();
- return "";
-}
-
-void wifiSmartConfig()
-{
- WiFi.beginSmartConfig();
-
- // Wait for SmartConfig packet from mobile
- Serial.println("Waiting for SmartConfig.");
- while (!WiFi.smartConfigDone())
- {
- delay(500);
- Serial.print(".");
- }
-
- Serial.println("");
- Serial.println("SmartConfig received.");
-
- // Wait for WiFi to connect to AP
- Serial.println("Waiting for Wi-Fi");
- while (WiFi.status() != WL_CONNECTED)
- {
- delay(500);
- Serial.print(".");
- }
-
- Serial.println("Wi-Fi Connected.");
-
- Serial.print("IP Address: ");
- Serial.println(WiFi.localIP());
-
- Serial.println("Saving network information to LittleFS...");
-
- String ssid = WiFi.SSID();
- String content = String(ssid);
- String pass = WiFi.psk();
-
- content.concat("\n");
- content.concat(pass);
-
- writeFile("/wifi.conf", content);
-}
-
-/// @brief Try saved WiFi credentials
+/// @brief Try saved Wi-Fi credentials
/// @return Returns true if connected
-bool trySavedWiFi()
-{
- File file = LittleFS.open(wifiInfo, "r");
+bool trySavedWiFi();
- if (!file)
- {
- return false;
- }
-
- String ssid = file.readStringUntil('\n');
- String pass = file.readString();
- file.close();
-
- Serial.println("Saved SSID:");
- Serial.println(ssid);
- Serial.println("Saved PSK:");
- Serial.println(pass);
-
- Serial.println("Trying to connect to saved Wi-Fi... (Waiting for 6 seconds)");
-
- WiFi.begin(ssid, pass);
-
- delay(6000);
- auto status = WiFi.status();
- Serial.printf("Wi-Fi Status: %d (%s)\n", status, getStatusMessage(status));
-
- return WiFi.status() == WL_CONNECTED;
-}
-
-void initWiFi()
-{
- // Init WiFi as Station, start SmartConfig
- WiFi.mode(WIFI_STA);
- delay(500);
-
- if (trySavedWiFi())
- {
- Serial.print("IP Address: ");
- Serial.println(WiFi.localIP());
- return;
- }
-
- wifiSmartConfig();
-}
+void initWiFi();
diff --git a/src/main.cpp b/src/main.cpp
index 7dc9dd8..09fefcf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,23 +5,47 @@
#include
#include
#include
-#include
#include
-#include "cert.h"
-#include "private_key.h"
+#include
+#include
-using namespace httpsserver;
+std::unique_ptr api;
+auto ntpServer = "pool.ntp.org";
-SSLCert cert = SSLCert(
- projectCert_der, projectCert_der_len,
- projectKey_der, projectKey_der_len);
-
-HTTPSServer server = HTTPSServer(&cert);
-
-void handleRoot(HTTPRequest *req, HTTPResponse *res)
+void runHttps(void *params)
{
- res->setHeader("Content-Type", "text/plain");
- res->println("Hello from ESP32 over HTTPS!\n");
+ if (!api->server->start())
+ {
+ Serial.println("HTTPS server failed to start!");
+ }
+
+ if (api->server->isRunning())
+ {
+ // ReSharper disable once CppDFAEndlessLoop
+ while (true)
+ {
+ api->server->loop();
+ delay(10);
+ }
+ }
+}
+
+void runHttp(void *params)
+{
+ if (!api->fallbackServer.start())
+ {
+ Serial.println("HTTP server failed to start!");
+ }
+
+ if (api->fallbackServer.isRunning())
+ {
+ // ReSharper disable once CppDFAEndlessLoop
+ while (true)
+ {
+ api->fallbackServer.loop();
+ delay(10);
+ }
+ }
}
void setupServer()
@@ -31,39 +55,71 @@ void setupServer()
Serial.println("MDNS responder started");
}
- // server.getServer().setRSACert(new BearSSL::X509List(server_cert), new BearSSL::PrivateKey(server_private_key));
- // server.getServer().setCache(&serverCache);
-
- ResourceNode *nodeRoot = new ResourceNode("/", "GET", &handleRoot);
-
- server.registerNode(nodeRoot);
- server.start();
+ api = std::make_unique();
+ xTaskCreatePinnedToCore(runHttp, "http80", 6144, nullptr, 1, nullptr, ARDUINO_RUNNING_CORE);
+ xTaskCreatePinnedToCore(runHttps, "http443", 6144, nullptr, 1, nullptr, ARDUINO_RUNNING_CORE);
MDNS.addService("https", "tcp", 443);
}
+void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
+ Serial.printf("Listing directory: %s\r\n", dirname);
+
+ File root = fs.open(dirname);
+ if(!root){
+ Serial.println("- failed to open directory");
+ return;
+ }
+ if(!root.isDirectory()){
+ Serial.println(" - not a directory");
+ return;
+ }
+
+ File file = root.openNextFile();
+ while(file){
+ if(file.isDirectory()){
+ Serial.print(" DIR : ");
+ Serial.println(file.name());
+ if(levels){
+ listDir(fs, file.path(), levels -1);
+ }
+ } else {
+ Serial.print(" FILE: ");
+ Serial.print(file.name());
+ Serial.print("\tSIZE: ");
+ Serial.println(file.size());
+ }
+ file = root.openNextFile();
+ }
+}
+
void setup()
{
Serial.begin(9600);
+ pinMode(BUZZER, OUTPUT);
- if (!LittleFS.begin())
+ if (!LittleFS.begin(true))
{
Serial.println("An error occurred while mounting LittleFS!");
return;
}
+ listDir(LittleFS, "/", 1);
initWiFi();
-
+ configTime(0, 0, ntpServer);
setupServer();
- Serial.print("Token for this session: ");
- Serial.println(getToken().c_str());
+ while (!setupNfc())
+ {
+ delay(2500);
+ }
- setupApi(&server);
+ Serial.print("Token for this session: ");
+ Serial.println(HttpApi::getToken().c_str());
}
void loop()
{
- server.loop();
- delay(1);
+ handleNfc();
+ delay(1000);
}