Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 incentive
|
2385c66a46 | ||
 Your Name
|
eecc0a4a22
|
||
|
incentive
|
bf07783e7f | ||
|
Your Name
|
ce4993a07e
|
||
|
incentive
|
e61e6816a3 | ||
|
incentive
|
ce1dd49c6e | ||
|
incentive
|
5329b69467 | ||
|
incentive
|
a2b36bc029 | ||
|
incentive
|
f3dbe1ab8b | ||
|
incentive
|
b2f3bb1b16 | ||
|
incentive
|
f5b05c9ba1 | ||
|
incentive
|
afbd09d701 | ||
|
incentive
|
39baf9fa87 | ||
|
incentive
|
222d493496 |
@@ -44,3 +44,5 @@ source-bestiary/
|
|||||||
source-drops/
|
source-drops/
|
||||||
site/server-status.json
|
site/server-status.json
|
||||||
site/server-status.json.tmp
|
site/server-status.json.tmp
|
||||||
|
/scripts/
|
||||||
|
/test/
|
||||||
|
|||||||
@@ -0,0 +1,661 @@
|
|||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are 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.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
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 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 work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero 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 Affero 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 Affero 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 Affero 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.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
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 AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,514 +0,0 @@
|
|||||||
import json
|
|
||||||
import re
|
|
||||||
import os
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import psycopg
|
|
||||||
|
|
||||||
|
|
||||||
SUPPORTED_KEY_VERSIONS = {
|
|
||||||
"dc_v2": {"label": "DC V2"},
|
|
||||||
"pc_v2": {"label": "PC V2"},
|
|
||||||
"gc_v3": {"label": "GC V3"},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def register_key_routes(
|
|
||||||
app,
|
|
||||||
*,
|
|
||||||
connect,
|
|
||||||
current_user,
|
|
||||||
jsonify,
|
|
||||||
request,
|
|
||||||
account_id_str,
|
|
||||||
bb_account_id,
|
|
||||||
canonical_license_path,
|
|
||||||
refresh_account_manifest,
|
|
||||||
enqueue_account_sync,
|
|
||||||
bb_sync_info,
|
|
||||||
):
|
|
||||||
def ensure_key_profile_table():
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
|
|
||||||
id BIGSERIAL PRIMARY KEY,
|
|
||||||
user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
|
|
||||||
account_id BIGINT NOT NULL,
|
|
||||||
game_version TEXT NOT NULL,
|
|
||||||
label TEXT NOT NULL DEFAULT '',
|
|
||||||
serial_number_hex TEXT NOT NULL,
|
|
||||||
access_key TEXT NOT NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
UNIQUE (game_version, serial_number_hex)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def site_account_id(username):
|
|
||||||
return bb_account_id(username)
|
|
||||||
|
|
||||||
def user_has_bb_account(conn, user_id):
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute(
|
|
||||||
"SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
|
|
||||||
(user_id,),
|
|
||||||
)
|
|
||||||
return cur.fetchone() is not None
|
|
||||||
|
|
||||||
def normalize_serial_hex(value, game_version):
|
|
||||||
raw = str(value or "").strip()
|
|
||||||
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("serial number is required")
|
|
||||||
|
|
||||||
if game_version == "dc_v2":
|
|
||||||
v = raw.upper()
|
|
||||||
if v.startswith("0X"):
|
|
||||||
v = v[2:]
|
|
||||||
if not re.fullmatch(r"[0-9A-F]{1,8}", v):
|
|
||||||
raise ValueError("DC V2 serial must be hex, like 4E62F237")
|
|
||||||
return f"{int(v, 16):08X}"
|
|
||||||
|
|
||||||
if game_version == "pc_v2":
|
|
||||||
if not re.fullmatch(r"[0-9]{1,10}", raw):
|
|
||||||
raise ValueError("PC V2 serial must be digits only")
|
|
||||||
n = int(raw, 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("PC V2 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
if game_version == "gc_v3":
|
|
||||||
if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
|
|
||||||
raise ValueError("GC V3 serial must use the dashed format: NN-NNNN-NNNN.")
|
|
||||||
n = int(raw.replace("-", ""), 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("GC V3 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
raise ValueError("unsupported game version")
|
|
||||||
|
|
||||||
def validate_secret(value):
|
|
||||||
v = str(value or "").strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("key is required")
|
|
||||||
if len(v) > 64:
|
|
||||||
raise ValueError("key is too long")
|
|
||||||
if any(ord(ch) < 0x20 for ch in v):
|
|
||||||
raise ValueError("key contains invalid characters")
|
|
||||||
return v
|
|
||||||
|
|
||||||
def phosg_string(value):
|
|
||||||
return json.dumps(str(value))
|
|
||||||
|
|
||||||
def base_site_license_text(account_id, username):
|
|
||||||
aid_hex = f"0x{int(account_id):X}"
|
|
||||||
uname = phosg_string(username)
|
|
||||||
return (
|
|
||||||
"{\n"
|
|
||||||
" \"BBTeamID\": 0x0,\n"
|
|
||||||
" \"FormatVersion\": 0x1,\n"
|
|
||||||
f" \"AccountID\": {aid_hex},\n"
|
|
||||||
f" \"LastPlayerName\": {uname},\n"
|
|
||||||
" \"DCNTELicenses\": [],\n"
|
|
||||||
" \"BBLicenses\": [],\n"
|
|
||||||
" \"BanEndTime\": 0x0,\n"
|
|
||||||
" \"PCLicenses\": [],\n"
|
|
||||||
" \"AutoReplyMessage\": \"\",\n"
|
|
||||||
" \"GCLicenses\": [],\n"
|
|
||||||
" \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
|
|
||||||
" \"XBLicenses\": [],\n"
|
|
||||||
" \"Flags\": 0x0,\n"
|
|
||||||
" \"Ep3TotalMesetaEarned\": 0x0,\n"
|
|
||||||
" \"Ep3CurrentMeseta\": 0x0,\n"
|
|
||||||
" \"DCLicenses\": [],\n"
|
|
||||||
" \"UserFlags\": 0x0\n"
|
|
||||||
"}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def find_array_span(text, array_name):
|
|
||||||
marker = f'"{array_name}":'
|
|
||||||
marker_pos = text.find(marker)
|
|
||||||
if marker_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
bracket_pos = text.find("[", marker_pos)
|
|
||||||
if bracket_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
depth = 0
|
|
||||||
in_string = False
|
|
||||||
escape = False
|
|
||||||
|
|
||||||
for i in range(bracket_pos, len(text)):
|
|
||||||
ch = text[i]
|
|
||||||
|
|
||||||
if in_string:
|
|
||||||
if escape:
|
|
||||||
escape = False
|
|
||||||
elif ch == "\\":
|
|
||||||
escape = True
|
|
||||||
elif ch == '"':
|
|
||||||
in_string = False
|
|
||||||
else:
|
|
||||||
if ch == '"':
|
|
||||||
in_string = True
|
|
||||||
elif ch == "[":
|
|
||||||
depth += 1
|
|
||||||
elif ch == "]":
|
|
||||||
depth -= 1
|
|
||||||
if depth == 0:
|
|
||||||
return bracket_pos, i + 1
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def replace_license_array(text, array_name, entries):
|
|
||||||
span = find_array_span(text, array_name)
|
|
||||||
if span is None:
|
|
||||||
raise RuntimeError(f"could not find {array_name} in license file")
|
|
||||||
|
|
||||||
start, end = span
|
|
||||||
rendered = "[]" if not entries else "[\n" + ",\n".join(f" {e}" for e in entries) + "\n ]"
|
|
||||||
return text[:start] + rendered + text[end:]
|
|
||||||
|
|
||||||
def render_v2_entry(row):
|
|
||||||
serial_hex = row["serial_number_hex"].upper()
|
|
||||||
secret = phosg_string(row["access_key"])
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
|
|
||||||
|
|
||||||
|
|
||||||
def rewrite_v2_license_arrays(conn, user, account_id):
|
|
||||||
path = canonical_license_path(account_id)
|
|
||||||
path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
|
|
||||||
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
|
|
||||||
pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
|
|
||||||
gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
|
|
||||||
|
|
||||||
text = replace_license_array(text, "DCLicenses", dc_entries)
|
|
||||||
text = replace_license_array(text, "PCLicenses", pc_entries)
|
|
||||||
text = replace_license_array(text, "GCLicenses", gc_entries)
|
|
||||||
|
|
||||||
tmp = path.with_suffix(path.suffix + ".tmp")
|
|
||||||
tmp.write_text(text + "\n")
|
|
||||||
tmp.replace(path)
|
|
||||||
|
|
||||||
sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
|
|
||||||
flat_path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
|
|
||||||
flat_tmp.write_text(text + "\n")
|
|
||||||
flat_tmp.replace(flat_path)
|
|
||||||
|
|
||||||
refresh_account_manifest(account_id)
|
|
||||||
enqueue_account_sync(account_id, "v2_key_profile_updated")
|
|
||||||
return path
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys")
|
|
||||||
def list_key_profiles():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"authenticated": False}), 401
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex, created_at, updated_at
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"authenticated": True,
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"regions": sync["regions"],
|
|
||||||
"keys": [{
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
|
||||||
"updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
|
|
||||||
} for row in rows],
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def license_text_has_serial(text, serial_hex):
|
|
||||||
want_hex = (serial_hex or "").upper().lstrip("0") or "0"
|
|
||||||
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
|
|
||||||
got_hex = match.group(1).upper().lstrip("0") or "0"
|
|
||||||
if got_hex == want_hex:
|
|
||||||
return True
|
|
||||||
|
|
||||||
try:
|
|
||||||
want_dec = str(int(serial_hex, 16))
|
|
||||||
except ValueError:
|
|
||||||
want_dec = None
|
|
||||||
|
|
||||||
if want_dec is not None:
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
|
|
||||||
if match.group(1) == want_dec:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def find_existing_key_owner(serial_hex, current_account_id):
|
|
||||||
root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
|
|
||||||
current_ids = {
|
|
||||||
account_id_str(current_account_id),
|
|
||||||
str(int(current_account_id)),
|
|
||||||
}
|
|
||||||
|
|
||||||
def owner_for_license_path(license_path):
|
|
||||||
try:
|
|
||||||
rel = license_path.relative_to(root)
|
|
||||||
parts = rel.parts
|
|
||||||
except Exception:
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
# canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
for i in range(1, len(parts) - 2):
|
|
||||||
if parts[i:i + 2] == ("system", "licenses"):
|
|
||||||
possible = parts[i - 1]
|
|
||||||
if re.fullmatch(r"[0-9]{10}", possible):
|
|
||||||
return possible
|
|
||||||
|
|
||||||
# canonical-system/system/licenses/ACCOUNT.json
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
search_paths = []
|
|
||||||
seen_paths = set()
|
|
||||||
|
|
||||||
for base in (
|
|
||||||
root / "canonical",
|
|
||||||
root / "canonical-system",
|
|
||||||
root / "inbox",
|
|
||||||
):
|
|
||||||
if not base.is_dir():
|
|
||||||
continue
|
|
||||||
|
|
||||||
for license_path in sorted(base.rglob("system/licenses/*.json")):
|
|
||||||
if license_path in seen_paths:
|
|
||||||
continue
|
|
||||||
seen_paths.add(license_path)
|
|
||||||
search_paths.append((license_path, owner_for_license_path(license_path)))
|
|
||||||
|
|
||||||
for license_path, owner_account_id in search_paths:
|
|
||||||
if owner_account_id in current_ids:
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
text = license_path.read_text(errors="ignore")
|
|
||||||
except OSError:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if license_text_has_serial(text, serial_hex):
|
|
||||||
return {
|
|
||||||
"account_id": owner_account_id,
|
|
||||||
"path": str(license_path),
|
|
||||||
}
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/keys/register")
|
|
||||||
def register_key_profile():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
if not user_has_bb_account(conn, user["id"]):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
|
|
||||||
"bb_account_required": True,
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
data = request.get_json(silent=True) or {}
|
|
||||||
game_version = str(data.get("game_version") or "").strip().lower()
|
|
||||||
label = str(data.get("label") or "").strip()[:80]
|
|
||||||
|
|
||||||
if game_version not in SUPPORTED_KEY_VERSIONS:
|
|
||||||
return jsonify({"error": "unsupported game version"}), 400
|
|
||||||
|
|
||||||
try:
|
|
||||||
serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
|
|
||||||
key_secret = validate_secret(data.get("access_key"))
|
|
||||||
except ValueError as e:
|
|
||||||
return jsonify({"error": str(e)}), 400
|
|
||||||
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
duplicate = find_existing_key_owner(serial_hex, account_id)
|
|
||||||
if duplicate:
|
|
||||||
return jsonify({
|
|
||||||
"error": "that key is already registered to another account"
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
try:
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO v2_v3_key_profiles (
|
|
||||||
user_id,
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_number_hex,
|
|
||||||
access_key
|
|
||||||
) VALUES (%s, %s, %s, %s, %s, %s)
|
|
||||||
RETURNING id
|
|
||||||
""", (
|
|
||||||
user["id"],
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_hex,
|
|
||||||
key_secret,
|
|
||||||
))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
except psycopg.errors.UniqueViolation:
|
|
||||||
return jsonify({"error": "that key is already registered to an account"}), 409
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": game_version,
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
|
|
||||||
"label": label,
|
|
||||||
"serial_number_hex": serial_hex,
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys/<int:key_id>/access-key")
|
|
||||||
def get_key_access_key(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before viewing game account keys.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"access_key": row["access_key"],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete("/keys/<int:key_id>")
|
|
||||||
def delete_key_profile(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
cur.execute("""
|
|
||||||
DELETE FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"deleted": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
@@ -1,530 +0,0 @@
|
|||||||
import json
|
|
||||||
import re
|
|
||||||
import os
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import psycopg
|
|
||||||
|
|
||||||
|
|
||||||
SUPPORTED_KEY_VERSIONS = {
|
|
||||||
"dc_v2": {"label": "DC V2"},
|
|
||||||
"pc_v2": {"label": "PC V2"},
|
|
||||||
"gc_v3": {"label": "GC V3"},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def register_key_routes(
|
|
||||||
app,
|
|
||||||
*,
|
|
||||||
connect,
|
|
||||||
current_user,
|
|
||||||
jsonify,
|
|
||||||
request,
|
|
||||||
account_id_str,
|
|
||||||
bb_account_id,
|
|
||||||
canonical_license_path,
|
|
||||||
refresh_account_manifest,
|
|
||||||
enqueue_account_sync,
|
|
||||||
bb_sync_info,
|
|
||||||
):
|
|
||||||
def ensure_key_profile_table():
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
|
|
||||||
id BIGSERIAL PRIMARY KEY,
|
|
||||||
user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
|
|
||||||
account_id BIGINT NOT NULL,
|
|
||||||
game_version TEXT NOT NULL,
|
|
||||||
label TEXT NOT NULL DEFAULT '',
|
|
||||||
serial_number_hex TEXT NOT NULL,
|
|
||||||
access_key TEXT NOT NULL,
|
|
||||||
gc_password TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
UNIQUE (game_version, serial_number_hex)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
cur.execute("""
|
|
||||||
ALTER TABLE v2_v3_key_profiles
|
|
||||||
ADD COLUMN IF NOT EXISTS gc_password TEXT
|
|
||||||
""")
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def site_account_id(username):
|
|
||||||
return bb_account_id(username)
|
|
||||||
|
|
||||||
def user_has_bb_account(conn, user_id):
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute(
|
|
||||||
"SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
|
|
||||||
(user_id,),
|
|
||||||
)
|
|
||||||
return cur.fetchone() is not None
|
|
||||||
|
|
||||||
def normalize_serial_hex(value, game_version):
|
|
||||||
raw = str(value or "").strip()
|
|
||||||
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("serial number is required")
|
|
||||||
|
|
||||||
if game_version == "dc_v2":
|
|
||||||
v = raw.upper()
|
|
||||||
if v.startswith("0X"):
|
|
||||||
v = v[2:]
|
|
||||||
if not re.fullmatch(r"[0-9A-F]{1,8}", v):
|
|
||||||
raise ValueError("DC V2 serial must be hex, like 4E62F237")
|
|
||||||
return f"{int(v, 16):08X}"
|
|
||||||
|
|
||||||
if game_version == "pc_v2":
|
|
||||||
if not re.fullmatch(r"[0-9]{1,10}", raw):
|
|
||||||
raise ValueError("PC V2 serial must be digits only")
|
|
||||||
n = int(raw, 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("PC V2 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
if game_version == "gc_v3":
|
|
||||||
if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
|
|
||||||
raise ValueError("GC V3 serial must use the dashed format: NN-NNNN-NNNN.")
|
|
||||||
n = int(raw.replace("-", ""), 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("GC V3 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
raise ValueError("unsupported game version")
|
|
||||||
|
|
||||||
def validate_secret(value):
|
|
||||||
v = str(value or "").strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("key is required")
|
|
||||||
if len(v) > 64:
|
|
||||||
raise ValueError("key is too long")
|
|
||||||
if any(ord(ch) < 0x20 for ch in v):
|
|
||||||
raise ValueError("key contains invalid characters")
|
|
||||||
return v
|
|
||||||
|
|
||||||
def phosg_string(value):
|
|
||||||
return json.dumps(str(value))
|
|
||||||
|
|
||||||
def base_site_license_text(account_id, username):
|
|
||||||
aid_hex = f"0x{int(account_id):X}"
|
|
||||||
uname = phosg_string(username)
|
|
||||||
return (
|
|
||||||
"{\n"
|
|
||||||
" \"BBTeamID\": 0x0,\n"
|
|
||||||
" \"FormatVersion\": 0x1,\n"
|
|
||||||
f" \"AccountID\": {aid_hex},\n"
|
|
||||||
f" \"LastPlayerName\": {uname},\n"
|
|
||||||
" \"DCNTELicenses\": [],\n"
|
|
||||||
" \"BBLicenses\": [],\n"
|
|
||||||
" \"BanEndTime\": 0x0,\n"
|
|
||||||
" \"PCLicenses\": [],\n"
|
|
||||||
" \"AutoReplyMessage\": \"\",\n"
|
|
||||||
" \"GCLicenses\": [],\n"
|
|
||||||
" \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
|
|
||||||
" \"XBLicenses\": [],\n"
|
|
||||||
" \"Flags\": 0x0,\n"
|
|
||||||
" \"Ep3TotalMesetaEarned\": 0x0,\n"
|
|
||||||
" \"Ep3CurrentMeseta\": 0x0,\n"
|
|
||||||
" \"DCLicenses\": [],\n"
|
|
||||||
" \"UserFlags\": 0x0\n"
|
|
||||||
"}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def find_array_span(text, array_name):
|
|
||||||
marker = f'"{array_name}":'
|
|
||||||
marker_pos = text.find(marker)
|
|
||||||
if marker_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
bracket_pos = text.find("[", marker_pos)
|
|
||||||
if bracket_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
depth = 0
|
|
||||||
in_string = False
|
|
||||||
escape = False
|
|
||||||
|
|
||||||
for i in range(bracket_pos, len(text)):
|
|
||||||
ch = text[i]
|
|
||||||
|
|
||||||
if in_string:
|
|
||||||
if escape:
|
|
||||||
escape = False
|
|
||||||
elif ch == "\\":
|
|
||||||
escape = True
|
|
||||||
elif ch == '"':
|
|
||||||
in_string = False
|
|
||||||
else:
|
|
||||||
if ch == '"':
|
|
||||||
in_string = True
|
|
||||||
elif ch == "[":
|
|
||||||
depth += 1
|
|
||||||
elif ch == "]":
|
|
||||||
depth -= 1
|
|
||||||
if depth == 0:
|
|
||||||
return bracket_pos, i + 1
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def replace_license_array(text, array_name, entries):
|
|
||||||
span = find_array_span(text, array_name)
|
|
||||||
if span is None:
|
|
||||||
raise RuntimeError(f"could not find {array_name} in license file")
|
|
||||||
|
|
||||||
start, end = span
|
|
||||||
rendered = "[]" if not entries else "[\n" + ",\n".join(f" {e}" for e in entries) + "\n ]"
|
|
||||||
return text[:start] + rendered + text[end:]
|
|
||||||
|
|
||||||
def render_v2_entry(row):
|
|
||||||
serial_hex = row["serial_number_hex"].upper()
|
|
||||||
secret = phosg_string(row["access_key"])
|
|
||||||
|
|
||||||
if row["game_version"] == "gc_v3":
|
|
||||||
gc_password = row.get("gc_password")
|
|
||||||
if not gc_password:
|
|
||||||
raise RuntimeError("GC V3 key profile is missing its GC password")
|
|
||||||
password = phosg_string(gc_password)
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}, "Password": {password}}}'
|
|
||||||
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
|
|
||||||
|
|
||||||
|
|
||||||
def rewrite_v2_license_arrays(conn, user, account_id):
|
|
||||||
path = canonical_license_path(account_id)
|
|
||||||
path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
|
|
||||||
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT game_version, serial_number_hex, access_key, gc_password
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
|
|
||||||
pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
|
|
||||||
gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
|
|
||||||
|
|
||||||
text = replace_license_array(text, "DCLicenses", dc_entries)
|
|
||||||
text = replace_license_array(text, "PCLicenses", pc_entries)
|
|
||||||
text = replace_license_array(text, "GCLicenses", gc_entries)
|
|
||||||
|
|
||||||
tmp = path.with_suffix(path.suffix + ".tmp")
|
|
||||||
tmp.write_text(text + "\n")
|
|
||||||
tmp.replace(path)
|
|
||||||
|
|
||||||
sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
|
|
||||||
flat_path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
|
|
||||||
flat_tmp.write_text(text + "\n")
|
|
||||||
flat_tmp.replace(flat_path)
|
|
||||||
|
|
||||||
refresh_account_manifest(account_id)
|
|
||||||
enqueue_account_sync(account_id, "v2_key_profile_updated")
|
|
||||||
return path
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys")
|
|
||||||
def list_key_profiles():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"authenticated": False}), 401
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex, created_at, updated_at
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"authenticated": True,
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"regions": sync["regions"],
|
|
||||||
"keys": [{
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
|
||||||
"updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
|
|
||||||
} for row in rows],
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def license_text_has_serial(text, serial_hex):
|
|
||||||
want_hex = (serial_hex or "").upper().lstrip("0") or "0"
|
|
||||||
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
|
|
||||||
got_hex = match.group(1).upper().lstrip("0") or "0"
|
|
||||||
if got_hex == want_hex:
|
|
||||||
return True
|
|
||||||
|
|
||||||
try:
|
|
||||||
want_dec = str(int(serial_hex, 16))
|
|
||||||
except ValueError:
|
|
||||||
want_dec = None
|
|
||||||
|
|
||||||
if want_dec is not None:
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
|
|
||||||
if match.group(1) == want_dec:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def find_existing_key_owner(serial_hex, current_account_id):
|
|
||||||
root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
|
|
||||||
current_ids = {
|
|
||||||
account_id_str(current_account_id),
|
|
||||||
str(int(current_account_id)),
|
|
||||||
}
|
|
||||||
|
|
||||||
def owner_for_license_path(license_path):
|
|
||||||
try:
|
|
||||||
rel = license_path.relative_to(root)
|
|
||||||
parts = rel.parts
|
|
||||||
except Exception:
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
# canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
for i in range(1, len(parts) - 2):
|
|
||||||
if parts[i:i + 2] == ("system", "licenses"):
|
|
||||||
possible = parts[i - 1]
|
|
||||||
if re.fullmatch(r"[0-9]{10}", possible):
|
|
||||||
return possible
|
|
||||||
|
|
||||||
# canonical-system/system/licenses/ACCOUNT.json
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
search_paths = []
|
|
||||||
seen_paths = set()
|
|
||||||
|
|
||||||
for base in (
|
|
||||||
root / "canonical",
|
|
||||||
root / "canonical-system",
|
|
||||||
root / "inbox",
|
|
||||||
):
|
|
||||||
if not base.is_dir():
|
|
||||||
continue
|
|
||||||
|
|
||||||
for license_path in sorted(base.rglob("system/licenses/*.json")):
|
|
||||||
if license_path in seen_paths:
|
|
||||||
continue
|
|
||||||
seen_paths.add(license_path)
|
|
||||||
search_paths.append((license_path, owner_for_license_path(license_path)))
|
|
||||||
|
|
||||||
for license_path, owner_account_id in search_paths:
|
|
||||||
if owner_account_id in current_ids:
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
text = license_path.read_text(errors="ignore")
|
|
||||||
except OSError:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if license_text_has_serial(text, serial_hex):
|
|
||||||
return {
|
|
||||||
"account_id": owner_account_id,
|
|
||||||
"path": str(license_path),
|
|
||||||
}
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/keys/register")
|
|
||||||
def register_key_profile():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
if not user_has_bb_account(conn, user["id"]):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
|
|
||||||
"bb_account_required": True,
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
data = request.get_json(silent=True) or {}
|
|
||||||
game_version = str(data.get("game_version") or "").strip().lower()
|
|
||||||
label = str(data.get("label") or "").strip()[:80]
|
|
||||||
|
|
||||||
if game_version not in SUPPORTED_KEY_VERSIONS:
|
|
||||||
return jsonify({"error": "unsupported game version"}), 400
|
|
||||||
|
|
||||||
try:
|
|
||||||
serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
|
|
||||||
key_secret = validate_secret(data.get("access_key"))
|
|
||||||
gc_password = validate_secret(data.get("password")) if game_version == "gc_v3" else None
|
|
||||||
except ValueError as e:
|
|
||||||
return jsonify({"error": str(e)}), 400
|
|
||||||
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
duplicate = find_existing_key_owner(serial_hex, account_id)
|
|
||||||
if duplicate:
|
|
||||||
return jsonify({
|
|
||||||
"error": "that key is already registered to another account"
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
try:
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO v2_v3_key_profiles (
|
|
||||||
user_id,
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_number_hex,
|
|
||||||
access_key,
|
|
||||||
gc_password
|
|
||||||
) VALUES (%s, %s, %s, %s, %s, %s, %s)
|
|
||||||
RETURNING id
|
|
||||||
""", (
|
|
||||||
user["id"],
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_hex,
|
|
||||||
key_secret,
|
|
||||||
gc_password,
|
|
||||||
))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
except psycopg.errors.UniqueViolation:
|
|
||||||
return jsonify({"error": "that key is already registered to an account"}), 409
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": game_version,
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
|
|
||||||
"label": label,
|
|
||||||
"serial_number_hex": serial_hex,
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys/<int:key_id>/access-key")
|
|
||||||
def get_key_access_key(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before viewing game account keys.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"access_key": row["access_key"],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete("/keys/<int:key_id>")
|
|
||||||
def delete_key_profile(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
cur.execute("""
|
|
||||||
DELETE FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"deleted": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
@@ -1,514 +0,0 @@
|
|||||||
import json
|
|
||||||
import re
|
|
||||||
import os
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import psycopg
|
|
||||||
|
|
||||||
|
|
||||||
SUPPORTED_KEY_VERSIONS = {
|
|
||||||
"dc_v2": {"label": "DC V2"},
|
|
||||||
"pc_v2": {"label": "PC V2"},
|
|
||||||
"gc_v3": {"label": "GC V3"},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def register_key_routes(
|
|
||||||
app,
|
|
||||||
*,
|
|
||||||
connect,
|
|
||||||
current_user,
|
|
||||||
jsonify,
|
|
||||||
request,
|
|
||||||
account_id_str,
|
|
||||||
bb_account_id,
|
|
||||||
canonical_license_path,
|
|
||||||
refresh_account_manifest,
|
|
||||||
enqueue_account_sync,
|
|
||||||
bb_sync_info,
|
|
||||||
):
|
|
||||||
def ensure_key_profile_table():
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
|
|
||||||
id BIGSERIAL PRIMARY KEY,
|
|
||||||
user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
|
|
||||||
account_id BIGINT NOT NULL,
|
|
||||||
game_version TEXT NOT NULL,
|
|
||||||
label TEXT NOT NULL DEFAULT '',
|
|
||||||
serial_number_hex TEXT NOT NULL,
|
|
||||||
access_key TEXT NOT NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
UNIQUE (game_version, serial_number_hex)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def site_account_id(username):
|
|
||||||
return bb_account_id(username)
|
|
||||||
|
|
||||||
def user_has_bb_account(conn, user_id):
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute(
|
|
||||||
"SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
|
|
||||||
(user_id,),
|
|
||||||
)
|
|
||||||
return cur.fetchone() is not None
|
|
||||||
|
|
||||||
def normalize_serial_hex(value, game_version):
|
|
||||||
raw = str(value or "").strip()
|
|
||||||
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("serial number is required")
|
|
||||||
|
|
||||||
if game_version == "dc_v2":
|
|
||||||
v = raw.upper()
|
|
||||||
if v.startswith("0X"):
|
|
||||||
v = v[2:]
|
|
||||||
if not re.fullmatch(r"[0-9A-F]{1,8}", v):
|
|
||||||
raise ValueError("DC V2 serial must be hex, like 4E62F237")
|
|
||||||
return f"{int(v, 16):08X}"
|
|
||||||
|
|
||||||
if game_version == "pc_v2":
|
|
||||||
if not re.fullmatch(r"[0-9]{1,10}", raw):
|
|
||||||
raise ValueError("PC V2 serial must be digits only")
|
|
||||||
n = int(raw, 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("PC V2 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
if game_version == "gc_v3":
|
|
||||||
if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
|
|
||||||
raise ValueError("GC V3 serial must use the dashed format: NN-NNNN-NNNN.")
|
|
||||||
n = int(raw.replace("-", ""), 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("GC V3 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
raise ValueError("unsupported game version")
|
|
||||||
|
|
||||||
def validate_secret(value):
|
|
||||||
v = str(value or "").strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("key is required")
|
|
||||||
if len(v) > 64:
|
|
||||||
raise ValueError("key is too long")
|
|
||||||
if any(ord(ch) < 0x20 for ch in v):
|
|
||||||
raise ValueError("key contains invalid characters")
|
|
||||||
return v
|
|
||||||
|
|
||||||
def phosg_string(value):
|
|
||||||
return json.dumps(str(value))
|
|
||||||
|
|
||||||
def base_site_license_text(account_id, username):
|
|
||||||
aid_hex = f"0x{int(account_id):X}"
|
|
||||||
uname = phosg_string(username)
|
|
||||||
return (
|
|
||||||
"{\n"
|
|
||||||
" \"BBTeamID\": 0x0,\n"
|
|
||||||
" \"FormatVersion\": 0x1,\n"
|
|
||||||
f" \"AccountID\": {aid_hex},\n"
|
|
||||||
f" \"LastPlayerName\": {uname},\n"
|
|
||||||
" \"DCNTELicenses\": [],\n"
|
|
||||||
" \"BBLicenses\": [],\n"
|
|
||||||
" \"BanEndTime\": 0x0,\n"
|
|
||||||
" \"PCLicenses\": [],\n"
|
|
||||||
" \"AutoReplyMessage\": \"\",\n"
|
|
||||||
" \"GCLicenses\": [],\n"
|
|
||||||
" \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
|
|
||||||
" \"XBLicenses\": [],\n"
|
|
||||||
" \"Flags\": 0x0,\n"
|
|
||||||
" \"Ep3TotalMesetaEarned\": 0x0,\n"
|
|
||||||
" \"Ep3CurrentMeseta\": 0x0,\n"
|
|
||||||
" \"DCLicenses\": [],\n"
|
|
||||||
" \"UserFlags\": 0x0\n"
|
|
||||||
"}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def find_array_span(text, array_name):
|
|
||||||
marker = f'"{array_name}":'
|
|
||||||
marker_pos = text.find(marker)
|
|
||||||
if marker_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
bracket_pos = text.find("[", marker_pos)
|
|
||||||
if bracket_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
depth = 0
|
|
||||||
in_string = False
|
|
||||||
escape = False
|
|
||||||
|
|
||||||
for i in range(bracket_pos, len(text)):
|
|
||||||
ch = text[i]
|
|
||||||
|
|
||||||
if in_string:
|
|
||||||
if escape:
|
|
||||||
escape = False
|
|
||||||
elif ch == "\\":
|
|
||||||
escape = True
|
|
||||||
elif ch == '"':
|
|
||||||
in_string = False
|
|
||||||
else:
|
|
||||||
if ch == '"':
|
|
||||||
in_string = True
|
|
||||||
elif ch == "[":
|
|
||||||
depth += 1
|
|
||||||
elif ch == "]":
|
|
||||||
depth -= 1
|
|
||||||
if depth == 0:
|
|
||||||
return bracket_pos, i + 1
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def replace_license_array(text, array_name, entries):
|
|
||||||
span = find_array_span(text, array_name)
|
|
||||||
if span is None:
|
|
||||||
raise RuntimeError(f"could not find {array_name} in license file")
|
|
||||||
|
|
||||||
start, end = span
|
|
||||||
rendered = "[]" if not entries else "[\n" + ",\n".join(f" {e}" for e in entries) + "\n ]"
|
|
||||||
return text[:start] + rendered + text[end:]
|
|
||||||
|
|
||||||
def render_v2_entry(row):
|
|
||||||
serial_hex = row["serial_number_hex"].upper()
|
|
||||||
secret = phosg_string(row["access_key"])
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
|
|
||||||
|
|
||||||
|
|
||||||
def rewrite_v2_license_arrays(conn, user, account_id):
|
|
||||||
path = canonical_license_path(account_id)
|
|
||||||
path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
|
|
||||||
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
|
|
||||||
pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
|
|
||||||
gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
|
|
||||||
|
|
||||||
text = replace_license_array(text, "DCLicenses", dc_entries)
|
|
||||||
text = replace_license_array(text, "PCLicenses", pc_entries)
|
|
||||||
text = replace_license_array(text, "GCLicenses", gc_entries)
|
|
||||||
|
|
||||||
tmp = path.with_suffix(path.suffix + ".tmp")
|
|
||||||
tmp.write_text(text + "\n")
|
|
||||||
tmp.replace(path)
|
|
||||||
|
|
||||||
sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
|
|
||||||
flat_path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
|
|
||||||
flat_tmp.write_text(text + "\n")
|
|
||||||
flat_tmp.replace(flat_path)
|
|
||||||
|
|
||||||
refresh_account_manifest(account_id)
|
|
||||||
enqueue_account_sync(account_id, "v2_key_profile_updated")
|
|
||||||
return path
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys")
|
|
||||||
def list_key_profiles():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"authenticated": False}), 401
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex, created_at, updated_at
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"authenticated": True,
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"regions": sync["regions"],
|
|
||||||
"keys": [{
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
|
||||||
"updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
|
|
||||||
} for row in rows],
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def license_text_has_serial(text, serial_hex):
|
|
||||||
want_hex = (serial_hex or "").upper().lstrip("0") or "0"
|
|
||||||
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
|
|
||||||
got_hex = match.group(1).upper().lstrip("0") or "0"
|
|
||||||
if got_hex == want_hex:
|
|
||||||
return True
|
|
||||||
|
|
||||||
try:
|
|
||||||
want_dec = str(int(serial_hex, 16))
|
|
||||||
except ValueError:
|
|
||||||
want_dec = None
|
|
||||||
|
|
||||||
if want_dec is not None:
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
|
|
||||||
if match.group(1) == want_dec:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def find_existing_key_owner(serial_hex, current_account_id):
|
|
||||||
root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
|
|
||||||
current_ids = {
|
|
||||||
account_id_str(current_account_id),
|
|
||||||
str(int(current_account_id)),
|
|
||||||
}
|
|
||||||
|
|
||||||
def owner_for_license_path(license_path):
|
|
||||||
try:
|
|
||||||
rel = license_path.relative_to(root)
|
|
||||||
parts = rel.parts
|
|
||||||
except Exception:
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
# canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
for i in range(1, len(parts) - 2):
|
|
||||||
if parts[i:i + 2] == ("system", "licenses"):
|
|
||||||
possible = parts[i - 1]
|
|
||||||
if re.fullmatch(r"[0-9]{10}", possible):
|
|
||||||
return possible
|
|
||||||
|
|
||||||
# canonical-system/system/licenses/ACCOUNT.json
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
search_paths = []
|
|
||||||
seen_paths = set()
|
|
||||||
|
|
||||||
for base in (
|
|
||||||
root / "canonical",
|
|
||||||
root / "canonical-system",
|
|
||||||
root / "inbox",
|
|
||||||
):
|
|
||||||
if not base.is_dir():
|
|
||||||
continue
|
|
||||||
|
|
||||||
for license_path in sorted(base.rglob("system/licenses/*.json")):
|
|
||||||
if license_path in seen_paths:
|
|
||||||
continue
|
|
||||||
seen_paths.add(license_path)
|
|
||||||
search_paths.append((license_path, owner_for_license_path(license_path)))
|
|
||||||
|
|
||||||
for license_path, owner_account_id in search_paths:
|
|
||||||
if owner_account_id in current_ids:
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
text = license_path.read_text(errors="ignore")
|
|
||||||
except OSError:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if license_text_has_serial(text, serial_hex):
|
|
||||||
return {
|
|
||||||
"account_id": owner_account_id,
|
|
||||||
"path": str(license_path),
|
|
||||||
}
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/keys/register")
|
|
||||||
def register_key_profile():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
if not user_has_bb_account(conn, user["id"]):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
|
|
||||||
"bb_account_required": True,
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
data = request.get_json(silent=True) or {}
|
|
||||||
game_version = str(data.get("game_version") or "").strip().lower()
|
|
||||||
label = str(data.get("label") or "").strip()[:80]
|
|
||||||
|
|
||||||
if game_version not in SUPPORTED_KEY_VERSIONS:
|
|
||||||
return jsonify({"error": "unsupported game version"}), 400
|
|
||||||
|
|
||||||
try:
|
|
||||||
serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
|
|
||||||
key_secret = validate_secret(data.get("access_key"))
|
|
||||||
except ValueError as e:
|
|
||||||
return jsonify({"error": str(e)}), 400
|
|
||||||
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
duplicate = find_existing_key_owner(serial_hex, account_id)
|
|
||||||
if duplicate:
|
|
||||||
return jsonify({
|
|
||||||
"error": "that key is already registered to another account"
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
try:
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO v2_v3_key_profiles (
|
|
||||||
user_id,
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_number_hex,
|
|
||||||
access_key
|
|
||||||
) VALUES (%s, %s, %s, %s, %s, %s)
|
|
||||||
RETURNING id
|
|
||||||
""", (
|
|
||||||
user["id"],
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_hex,
|
|
||||||
key_secret,
|
|
||||||
))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
except psycopg.errors.UniqueViolation:
|
|
||||||
return jsonify({"error": "that key is already registered to an account"}), 409
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": game_version,
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
|
|
||||||
"label": label,
|
|
||||||
"serial_number_hex": serial_hex,
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys/<int:key_id>/access-key")
|
|
||||||
def get_key_access_key(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before viewing game account keys.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"access_key": row["access_key"],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete("/keys/<int:key_id>")
|
|
||||||
def delete_key_profile(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
cur.execute("""
|
|
||||||
DELETE FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"deleted": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
@@ -1,514 +0,0 @@
|
|||||||
import json
|
|
||||||
import re
|
|
||||||
import os
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import psycopg
|
|
||||||
|
|
||||||
|
|
||||||
SUPPORTED_KEY_VERSIONS = {
|
|
||||||
"dc_v2": {"label": "DC V2"},
|
|
||||||
"pc_v2": {"label": "PC V2"},
|
|
||||||
"gc_v3": {"label": "GC V3"},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def register_key_routes(
|
|
||||||
app,
|
|
||||||
*,
|
|
||||||
connect,
|
|
||||||
current_user,
|
|
||||||
jsonify,
|
|
||||||
request,
|
|
||||||
account_id_str,
|
|
||||||
bb_account_id,
|
|
||||||
canonical_license_path,
|
|
||||||
refresh_account_manifest,
|
|
||||||
enqueue_account_sync,
|
|
||||||
bb_sync_info,
|
|
||||||
):
|
|
||||||
def ensure_key_profile_table():
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
|
|
||||||
id BIGSERIAL PRIMARY KEY,
|
|
||||||
user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
|
|
||||||
account_id BIGINT NOT NULL,
|
|
||||||
game_version TEXT NOT NULL,
|
|
||||||
label TEXT NOT NULL DEFAULT '',
|
|
||||||
serial_number_hex TEXT NOT NULL,
|
|
||||||
access_key TEXT NOT NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
UNIQUE (game_version, serial_number_hex)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def site_account_id(username):
|
|
||||||
return bb_account_id(username)
|
|
||||||
|
|
||||||
def user_has_bb_account(conn, user_id):
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute(
|
|
||||||
"SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
|
|
||||||
(user_id,),
|
|
||||||
)
|
|
||||||
return cur.fetchone() is not None
|
|
||||||
|
|
||||||
def normalize_serial_hex(value, game_version):
|
|
||||||
raw = str(value or "").strip()
|
|
||||||
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("serial number is required")
|
|
||||||
|
|
||||||
if game_version == "dc_v2":
|
|
||||||
v = raw.upper()
|
|
||||||
if v.startswith("0X"):
|
|
||||||
v = v[2:]
|
|
||||||
if not re.fullmatch(r"[0-9A-F]{1,8}", v):
|
|
||||||
raise ValueError("DC V2 serial must be hex, like 4E62F237")
|
|
||||||
return f"{int(v, 16):08X}"
|
|
||||||
|
|
||||||
if game_version == "pc_v2":
|
|
||||||
if not re.fullmatch(r"[0-9]{1,10}", raw):
|
|
||||||
raise ValueError("PC V2 serial must be digits only")
|
|
||||||
n = int(raw, 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("PC V2 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
if game_version == "gc_v3":
|
|
||||||
if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
|
|
||||||
raise ValueError("GC V3 serial must use the dashed format, like 21-3364-4991")
|
|
||||||
n = int(raw.replace("-", ""), 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("GC V3 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
raise ValueError("unsupported game version")
|
|
||||||
|
|
||||||
def validate_secret(value):
|
|
||||||
v = str(value or "").strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("key is required")
|
|
||||||
if len(v) > 64:
|
|
||||||
raise ValueError("key is too long")
|
|
||||||
if any(ord(ch) < 0x20 for ch in v):
|
|
||||||
raise ValueError("key contains invalid characters")
|
|
||||||
return v
|
|
||||||
|
|
||||||
def phosg_string(value):
|
|
||||||
return json.dumps(str(value))
|
|
||||||
|
|
||||||
def base_site_license_text(account_id, username):
|
|
||||||
aid_hex = f"0x{int(account_id):X}"
|
|
||||||
uname = phosg_string(username)
|
|
||||||
return (
|
|
||||||
"{\n"
|
|
||||||
" \"BBTeamID\": 0x0,\n"
|
|
||||||
" \"FormatVersion\": 0x1,\n"
|
|
||||||
f" \"AccountID\": {aid_hex},\n"
|
|
||||||
f" \"LastPlayerName\": {uname},\n"
|
|
||||||
" \"DCNTELicenses\": [],\n"
|
|
||||||
" \"BBLicenses\": [],\n"
|
|
||||||
" \"BanEndTime\": 0x0,\n"
|
|
||||||
" \"PCLicenses\": [],\n"
|
|
||||||
" \"AutoReplyMessage\": \"\",\n"
|
|
||||||
" \"GCLicenses\": [],\n"
|
|
||||||
" \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
|
|
||||||
" \"XBLicenses\": [],\n"
|
|
||||||
" \"Flags\": 0x0,\n"
|
|
||||||
" \"Ep3TotalMesetaEarned\": 0x0,\n"
|
|
||||||
" \"Ep3CurrentMeseta\": 0x0,\n"
|
|
||||||
" \"DCLicenses\": [],\n"
|
|
||||||
" \"UserFlags\": 0x0\n"
|
|
||||||
"}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def find_array_span(text, array_name):
|
|
||||||
marker = f'"{array_name}":'
|
|
||||||
marker_pos = text.find(marker)
|
|
||||||
if marker_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
bracket_pos = text.find("[", marker_pos)
|
|
||||||
if bracket_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
depth = 0
|
|
||||||
in_string = False
|
|
||||||
escape = False
|
|
||||||
|
|
||||||
for i in range(bracket_pos, len(text)):
|
|
||||||
ch = text[i]
|
|
||||||
|
|
||||||
if in_string:
|
|
||||||
if escape:
|
|
||||||
escape = False
|
|
||||||
elif ch == "\\":
|
|
||||||
escape = True
|
|
||||||
elif ch == '"':
|
|
||||||
in_string = False
|
|
||||||
else:
|
|
||||||
if ch == '"':
|
|
||||||
in_string = True
|
|
||||||
elif ch == "[":
|
|
||||||
depth += 1
|
|
||||||
elif ch == "]":
|
|
||||||
depth -= 1
|
|
||||||
if depth == 0:
|
|
||||||
return bracket_pos, i + 1
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def replace_license_array(text, array_name, entries):
|
|
||||||
span = find_array_span(text, array_name)
|
|
||||||
if span is None:
|
|
||||||
raise RuntimeError(f"could not find {array_name} in license file")
|
|
||||||
|
|
||||||
start, end = span
|
|
||||||
rendered = "[]" if not entries else "[\n" + ",\n".join(f" {e}" for e in entries) + "\n ]"
|
|
||||||
return text[:start] + rendered + text[end:]
|
|
||||||
|
|
||||||
def render_v2_entry(row):
|
|
||||||
serial_hex = row["serial_number_hex"].upper()
|
|
||||||
secret = phosg_string(row["access_key"])
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
|
|
||||||
|
|
||||||
|
|
||||||
def rewrite_v2_license_arrays(conn, user, account_id):
|
|
||||||
path = canonical_license_path(account_id)
|
|
||||||
path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
|
|
||||||
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
|
|
||||||
pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
|
|
||||||
gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
|
|
||||||
|
|
||||||
text = replace_license_array(text, "DCLicenses", dc_entries)
|
|
||||||
text = replace_license_array(text, "PCLicenses", pc_entries)
|
|
||||||
text = replace_license_array(text, "GCLicenses", gc_entries)
|
|
||||||
|
|
||||||
tmp = path.with_suffix(path.suffix + ".tmp")
|
|
||||||
tmp.write_text(text + "\n")
|
|
||||||
tmp.replace(path)
|
|
||||||
|
|
||||||
sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
|
|
||||||
flat_path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
|
|
||||||
flat_tmp.write_text(text + "\n")
|
|
||||||
flat_tmp.replace(flat_path)
|
|
||||||
|
|
||||||
refresh_account_manifest(account_id)
|
|
||||||
enqueue_account_sync(account_id, "v2_key_profile_updated")
|
|
||||||
return path
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys")
|
|
||||||
def list_key_profiles():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"authenticated": False}), 401
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex, created_at, updated_at
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"authenticated": True,
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"regions": sync["regions"],
|
|
||||||
"keys": [{
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
|
||||||
"updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
|
|
||||||
} for row in rows],
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def license_text_has_serial(text, serial_hex):
|
|
||||||
want_hex = (serial_hex or "").upper().lstrip("0") or "0"
|
|
||||||
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
|
|
||||||
got_hex = match.group(1).upper().lstrip("0") or "0"
|
|
||||||
if got_hex == want_hex:
|
|
||||||
return True
|
|
||||||
|
|
||||||
try:
|
|
||||||
want_dec = str(int(serial_hex, 16))
|
|
||||||
except ValueError:
|
|
||||||
want_dec = None
|
|
||||||
|
|
||||||
if want_dec is not None:
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
|
|
||||||
if match.group(1) == want_dec:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def find_existing_key_owner(serial_hex, current_account_id):
|
|
||||||
root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
|
|
||||||
current_ids = {
|
|
||||||
account_id_str(current_account_id),
|
|
||||||
str(int(current_account_id)),
|
|
||||||
}
|
|
||||||
|
|
||||||
def owner_for_license_path(license_path):
|
|
||||||
try:
|
|
||||||
rel = license_path.relative_to(root)
|
|
||||||
parts = rel.parts
|
|
||||||
except Exception:
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
# canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
for i in range(1, len(parts) - 2):
|
|
||||||
if parts[i:i + 2] == ("system", "licenses"):
|
|
||||||
possible = parts[i - 1]
|
|
||||||
if re.fullmatch(r"[0-9]{10}", possible):
|
|
||||||
return possible
|
|
||||||
|
|
||||||
# canonical-system/system/licenses/ACCOUNT.json
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
search_paths = []
|
|
||||||
seen_paths = set()
|
|
||||||
|
|
||||||
for base in (
|
|
||||||
root / "canonical",
|
|
||||||
root / "canonical-system",
|
|
||||||
root / "inbox",
|
|
||||||
):
|
|
||||||
if not base.is_dir():
|
|
||||||
continue
|
|
||||||
|
|
||||||
for license_path in sorted(base.rglob("system/licenses/*.json")):
|
|
||||||
if license_path in seen_paths:
|
|
||||||
continue
|
|
||||||
seen_paths.add(license_path)
|
|
||||||
search_paths.append((license_path, owner_for_license_path(license_path)))
|
|
||||||
|
|
||||||
for license_path, owner_account_id in search_paths:
|
|
||||||
if owner_account_id in current_ids:
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
text = license_path.read_text(errors="ignore")
|
|
||||||
except OSError:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if license_text_has_serial(text, serial_hex):
|
|
||||||
return {
|
|
||||||
"account_id": owner_account_id,
|
|
||||||
"path": str(license_path),
|
|
||||||
}
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/keys/register")
|
|
||||||
def register_key_profile():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
if not user_has_bb_account(conn, user["id"]):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
|
|
||||||
"bb_account_required": True,
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
data = request.get_json(silent=True) or {}
|
|
||||||
game_version = str(data.get("game_version") or "").strip().lower()
|
|
||||||
label = str(data.get("label") or "").strip()[:80]
|
|
||||||
|
|
||||||
if game_version not in SUPPORTED_KEY_VERSIONS:
|
|
||||||
return jsonify({"error": "unsupported game version"}), 400
|
|
||||||
|
|
||||||
try:
|
|
||||||
serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
|
|
||||||
key_secret = validate_secret(data.get("access_key"))
|
|
||||||
except ValueError as e:
|
|
||||||
return jsonify({"error": str(e)}), 400
|
|
||||||
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
duplicate = find_existing_key_owner(serial_hex, account_id)
|
|
||||||
if duplicate:
|
|
||||||
return jsonify({
|
|
||||||
"error": "that key is already registered to another account"
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
try:
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO v2_v3_key_profiles (
|
|
||||||
user_id,
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_number_hex,
|
|
||||||
access_key
|
|
||||||
) VALUES (%s, %s, %s, %s, %s, %s)
|
|
||||||
RETURNING id
|
|
||||||
""", (
|
|
||||||
user["id"],
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_hex,
|
|
||||||
key_secret,
|
|
||||||
))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
except psycopg.errors.UniqueViolation:
|
|
||||||
return jsonify({"error": "that key is already registered to an account"}), 409
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": game_version,
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
|
|
||||||
"label": label,
|
|
||||||
"serial_number_hex": serial_hex,
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys/<int:key_id>/access-key")
|
|
||||||
def get_key_access_key(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before viewing game account keys.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"access_key": row["access_key"],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete("/keys/<int:key_id>")
|
|
||||||
def delete_key_profile(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
cur.execute("""
|
|
||||||
DELETE FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"deleted": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
@@ -1,514 +0,0 @@
|
|||||||
import json
|
|
||||||
import re
|
|
||||||
import os
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import psycopg
|
|
||||||
|
|
||||||
|
|
||||||
SUPPORTED_KEY_VERSIONS = {
|
|
||||||
"dc_v2": {"label": "DC V2"},
|
|
||||||
"pc_v2": {"label": "PC V2"},
|
|
||||||
"gc_v3": {"label": "GC V3"},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def register_key_routes(
|
|
||||||
app,
|
|
||||||
*,
|
|
||||||
connect,
|
|
||||||
current_user,
|
|
||||||
jsonify,
|
|
||||||
request,
|
|
||||||
account_id_str,
|
|
||||||
bb_account_id,
|
|
||||||
canonical_license_path,
|
|
||||||
refresh_account_manifest,
|
|
||||||
enqueue_account_sync,
|
|
||||||
bb_sync_info,
|
|
||||||
):
|
|
||||||
def ensure_key_profile_table():
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
|
|
||||||
id BIGSERIAL PRIMARY KEY,
|
|
||||||
user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
|
|
||||||
account_id BIGINT NOT NULL,
|
|
||||||
game_version TEXT NOT NULL,
|
|
||||||
label TEXT NOT NULL DEFAULT '',
|
|
||||||
serial_number_hex TEXT NOT NULL,
|
|
||||||
access_key TEXT NOT NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
UNIQUE (game_version, serial_number_hex)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def site_account_id(username):
|
|
||||||
return bb_account_id(username)
|
|
||||||
|
|
||||||
def user_has_bb_account(conn, user_id):
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute(
|
|
||||||
"SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
|
|
||||||
(user_id,),
|
|
||||||
)
|
|
||||||
return cur.fetchone() is not None
|
|
||||||
|
|
||||||
def normalize_serial_hex(value, game_version):
|
|
||||||
raw = str(value or "").strip()
|
|
||||||
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("serial number is required")
|
|
||||||
|
|
||||||
if game_version == "dc_v2":
|
|
||||||
v = raw.upper()
|
|
||||||
if v.startswith("0X"):
|
|
||||||
v = v[2:]
|
|
||||||
if not re.fullmatch(r"[0-9A-F]{1,8}", v):
|
|
||||||
raise ValueError("DC V2 serial must be hex, like 4E62F237")
|
|
||||||
return f"{int(v, 16):08X}"
|
|
||||||
|
|
||||||
if game_version == "pc_v2":
|
|
||||||
if not re.fullmatch(r"[0-9]{1,10}", raw):
|
|
||||||
raise ValueError("PC V2 serial must be digits only")
|
|
||||||
n = int(raw, 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("PC V2 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
if game_version == "gc_v3":
|
|
||||||
if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
|
|
||||||
raise ValueError("GC V3 serial must use the dashed format, like 21-3364-4991")
|
|
||||||
n = int(raw.replace("-", ""), 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("GC V3 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
raise ValueError("unsupported game version")
|
|
||||||
|
|
||||||
def validate_secret(value):
|
|
||||||
v = str(value or "").strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("key is required")
|
|
||||||
if len(v) > 64:
|
|
||||||
raise ValueError("key is too long")
|
|
||||||
if any(ord(ch) < 0x20 for ch in v):
|
|
||||||
raise ValueError("key contains invalid characters")
|
|
||||||
return v
|
|
||||||
|
|
||||||
def phosg_string(value):
|
|
||||||
return json.dumps(str(value))
|
|
||||||
|
|
||||||
def base_site_license_text(account_id, username):
|
|
||||||
aid_hex = f"0x{int(account_id):X}"
|
|
||||||
uname = phosg_string(username)
|
|
||||||
return (
|
|
||||||
"{\n"
|
|
||||||
" \"BBTeamID\": 0x0,\n"
|
|
||||||
" \"FormatVersion\": 0x1,\n"
|
|
||||||
f" \"AccountID\": {aid_hex},\n"
|
|
||||||
f" \"LastPlayerName\": {uname},\n"
|
|
||||||
" \"DCNTELicenses\": [],\n"
|
|
||||||
" \"BBLicenses\": [],\n"
|
|
||||||
" \"BanEndTime\": 0x0,\n"
|
|
||||||
" \"PCLicenses\": [],\n"
|
|
||||||
" \"AutoReplyMessage\": \"\",\n"
|
|
||||||
" \"GCLicenses\": [],\n"
|
|
||||||
" \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
|
|
||||||
" \"XBLicenses\": [],\n"
|
|
||||||
" \"Flags\": 0x0,\n"
|
|
||||||
" \"Ep3TotalMesetaEarned\": 0x0,\n"
|
|
||||||
" \"Ep3CurrentMeseta\": 0x0,\n"
|
|
||||||
" \"DCLicenses\": [],\n"
|
|
||||||
" \"UserFlags\": 0x0\n"
|
|
||||||
"}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def find_array_span(text, array_name):
|
|
||||||
marker = f'"{array_name}":'
|
|
||||||
marker_pos = text.find(marker)
|
|
||||||
if marker_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
bracket_pos = text.find("[", marker_pos)
|
|
||||||
if bracket_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
depth = 0
|
|
||||||
in_string = False
|
|
||||||
escape = False
|
|
||||||
|
|
||||||
for i in range(bracket_pos, len(text)):
|
|
||||||
ch = text[i]
|
|
||||||
|
|
||||||
if in_string:
|
|
||||||
if escape:
|
|
||||||
escape = False
|
|
||||||
elif ch == "\\":
|
|
||||||
escape = True
|
|
||||||
elif ch == '"':
|
|
||||||
in_string = False
|
|
||||||
else:
|
|
||||||
if ch == '"':
|
|
||||||
in_string = True
|
|
||||||
elif ch == "[":
|
|
||||||
depth += 1
|
|
||||||
elif ch == "]":
|
|
||||||
depth -= 1
|
|
||||||
if depth == 0:
|
|
||||||
return bracket_pos, i + 1
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def replace_license_array(text, array_name, entries):
|
|
||||||
span = find_array_span(text, array_name)
|
|
||||||
if span is None:
|
|
||||||
raise RuntimeError(f"could not find {array_name} in license file")
|
|
||||||
|
|
||||||
start, end = span
|
|
||||||
rendered = "[]" if not entries else "[\n" + ",\n".join(f" {e}" for e in entries) + "\n ]"
|
|
||||||
return text[:start] + rendered + text[end:]
|
|
||||||
|
|
||||||
def render_v2_entry(row):
|
|
||||||
serial_hex = row["serial_number_hex"].upper()
|
|
||||||
secret = phosg_string(row["access_key"])
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
|
|
||||||
|
|
||||||
|
|
||||||
def rewrite_v2_license_arrays(conn, user, account_id):
|
|
||||||
path = canonical_license_path(account_id)
|
|
||||||
path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
|
|
||||||
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
|
|
||||||
pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
|
|
||||||
gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
|
|
||||||
|
|
||||||
text = replace_license_array(text, "DCLicenses", dc_entries)
|
|
||||||
text = replace_license_array(text, "PCLicenses", pc_entries)
|
|
||||||
text = replace_license_array(text, "GCLicenses", gc_entries)
|
|
||||||
|
|
||||||
tmp = path.with_suffix(path.suffix + ".tmp")
|
|
||||||
tmp.write_text(text + "\n")
|
|
||||||
tmp.replace(path)
|
|
||||||
|
|
||||||
sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
|
|
||||||
flat_path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
|
|
||||||
flat_tmp.write_text(text + "\n")
|
|
||||||
flat_tmp.replace(flat_path)
|
|
||||||
|
|
||||||
refresh_account_manifest(account_id)
|
|
||||||
enqueue_account_sync(account_id, "v2_key_profile_updated")
|
|
||||||
return path
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys")
|
|
||||||
def list_key_profiles():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"authenticated": False}), 401
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex, created_at, updated_at
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"authenticated": True,
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"regions": sync["regions"],
|
|
||||||
"keys": [{
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
|
||||||
"updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
|
|
||||||
} for row in rows],
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def license_text_has_serial(text, serial_hex):
|
|
||||||
want_hex = (serial_hex or "").upper().lstrip("0") or "0"
|
|
||||||
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
|
|
||||||
got_hex = match.group(1).upper().lstrip("0") or "0"
|
|
||||||
if got_hex == want_hex:
|
|
||||||
return True
|
|
||||||
|
|
||||||
try:
|
|
||||||
want_dec = str(int(serial_hex, 16))
|
|
||||||
except ValueError:
|
|
||||||
want_dec = None
|
|
||||||
|
|
||||||
if want_dec is not None:
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
|
|
||||||
if match.group(1) == want_dec:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def find_existing_key_owner(serial_hex, current_account_id):
|
|
||||||
root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
|
|
||||||
current_ids = {
|
|
||||||
account_id_str(current_account_id),
|
|
||||||
str(int(current_account_id)),
|
|
||||||
}
|
|
||||||
|
|
||||||
def owner_for_license_path(license_path):
|
|
||||||
try:
|
|
||||||
rel = license_path.relative_to(root)
|
|
||||||
parts = rel.parts
|
|
||||||
except Exception:
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
# canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
for i in range(1, len(parts) - 2):
|
|
||||||
if parts[i:i + 2] == ("system", "licenses"):
|
|
||||||
possible = parts[i - 1]
|
|
||||||
if re.fullmatch(r"[0-9]{10}", possible):
|
|
||||||
return possible
|
|
||||||
|
|
||||||
# canonical-system/system/licenses/ACCOUNT.json
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
search_paths = []
|
|
||||||
seen_paths = set()
|
|
||||||
|
|
||||||
for base in (
|
|
||||||
root / "canonical",
|
|
||||||
root / "canonical-system",
|
|
||||||
root / "inbox",
|
|
||||||
):
|
|
||||||
if not base.is_dir():
|
|
||||||
continue
|
|
||||||
|
|
||||||
for license_path in sorted(base.rglob("system/licenses/*.json")):
|
|
||||||
if license_path in seen_paths:
|
|
||||||
continue
|
|
||||||
seen_paths.add(license_path)
|
|
||||||
search_paths.append((license_path, owner_for_license_path(license_path)))
|
|
||||||
|
|
||||||
for license_path, owner_account_id in search_paths:
|
|
||||||
if owner_account_id in current_ids:
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
text = license_path.read_text(errors="ignore")
|
|
||||||
except OSError:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if license_text_has_serial(text, serial_hex):
|
|
||||||
return {
|
|
||||||
"account_id": owner_account_id,
|
|
||||||
"path": str(license_path),
|
|
||||||
}
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/keys/register")
|
|
||||||
def register_key_profile():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
if not user_has_bb_account(conn, user["id"]):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
|
|
||||||
"bb_account_required": True,
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
data = request.get_json(silent=True) or {}
|
|
||||||
game_version = str(data.get("game_version") or "").strip().lower()
|
|
||||||
label = str(data.get("label") or "").strip()[:80]
|
|
||||||
|
|
||||||
if game_version not in SUPPORTED_KEY_VERSIONS:
|
|
||||||
return jsonify({"error": "unsupported game version"}), 400
|
|
||||||
|
|
||||||
try:
|
|
||||||
serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
|
|
||||||
key_secret = validate_secret(data.get("access_key"))
|
|
||||||
except ValueError as e:
|
|
||||||
return jsonify({"error": str(e)}), 400
|
|
||||||
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
duplicate = find_existing_key_owner(serial_hex, account_id)
|
|
||||||
if duplicate:
|
|
||||||
return jsonify({
|
|
||||||
"error": "that key is already registered to another account"
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
try:
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO v2_v3_key_profiles (
|
|
||||||
user_id,
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_number_hex,
|
|
||||||
access_key
|
|
||||||
) VALUES (%s, %s, %s, %s, %s, %s)
|
|
||||||
RETURNING id
|
|
||||||
""", (
|
|
||||||
user["id"],
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_hex,
|
|
||||||
key_secret,
|
|
||||||
))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
except psycopg.errors.UniqueViolation:
|
|
||||||
return jsonify({"error": "that key is already registered to an account"}), 409
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": game_version,
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
|
|
||||||
"label": label,
|
|
||||||
"serial_number_hex": serial_hex,
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys/<int:key_id>/access-key")
|
|
||||||
def get_key_access_key(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before viewing game account keys.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"access_key": row["access_key"],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete("/keys/<int:key_id>")
|
|
||||||
def delete_key_profile(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
cur.execute("""
|
|
||||||
DELETE FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"deleted": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
@@ -1,530 +0,0 @@
|
|||||||
import json
|
|
||||||
import re
|
|
||||||
import os
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import psycopg
|
|
||||||
|
|
||||||
|
|
||||||
SUPPORTED_KEY_VERSIONS = {
|
|
||||||
"dc_v2": {"label": "DC V2"},
|
|
||||||
"pc_v2": {"label": "PC V2"},
|
|
||||||
"gc_v3": {"label": "GC V3"},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def register_key_routes(
|
|
||||||
app,
|
|
||||||
*,
|
|
||||||
connect,
|
|
||||||
current_user,
|
|
||||||
jsonify,
|
|
||||||
request,
|
|
||||||
account_id_str,
|
|
||||||
bb_account_id,
|
|
||||||
canonical_license_path,
|
|
||||||
refresh_account_manifest,
|
|
||||||
enqueue_account_sync,
|
|
||||||
bb_sync_info,
|
|
||||||
):
|
|
||||||
def ensure_key_profile_table():
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
|
|
||||||
id BIGSERIAL PRIMARY KEY,
|
|
||||||
user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
|
|
||||||
account_id BIGINT NOT NULL,
|
|
||||||
game_version TEXT NOT NULL,
|
|
||||||
label TEXT NOT NULL DEFAULT '',
|
|
||||||
serial_number_hex TEXT NOT NULL,
|
|
||||||
access_key TEXT NOT NULL,
|
|
||||||
gc_password TEXT,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
UNIQUE (game_version, serial_number_hex)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
cur.execute("""
|
|
||||||
ALTER TABLE v2_v3_key_profiles
|
|
||||||
ADD COLUMN IF NOT EXISTS gc_password TEXT
|
|
||||||
""")
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def site_account_id(username):
|
|
||||||
return bb_account_id(username)
|
|
||||||
|
|
||||||
def user_has_bb_account(conn, user_id):
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute(
|
|
||||||
"SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
|
|
||||||
(user_id,),
|
|
||||||
)
|
|
||||||
return cur.fetchone() is not None
|
|
||||||
|
|
||||||
def normalize_serial_hex(value, game_version):
|
|
||||||
raw = str(value or "").strip()
|
|
||||||
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("serial number is required")
|
|
||||||
|
|
||||||
if game_version == "dc_v2":
|
|
||||||
v = raw.upper()
|
|
||||||
if v.startswith("0X"):
|
|
||||||
v = v[2:]
|
|
||||||
if not re.fullmatch(r"[0-9A-F]{1,8}", v):
|
|
||||||
raise ValueError("DC V2 serial must be hex, like 4E62F237")
|
|
||||||
return f"{int(v, 16):08X}"
|
|
||||||
|
|
||||||
if game_version == "pc_v2":
|
|
||||||
if not re.fullmatch(r"[0-9]{1,10}", raw):
|
|
||||||
raise ValueError("PC V2 serial must be digits only")
|
|
||||||
n = int(raw, 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("PC V2 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
if game_version == "gc_v3":
|
|
||||||
if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
|
|
||||||
raise ValueError("GC V3 serial must use the dashed format: NN-NNNN-NNNN.")
|
|
||||||
n = int(raw.replace("-", ""), 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("GC V3 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
raise ValueError("unsupported game version")
|
|
||||||
|
|
||||||
def validate_secret(value):
|
|
||||||
v = str(value or "").strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("key is required")
|
|
||||||
if len(v) > 64:
|
|
||||||
raise ValueError("key is too long")
|
|
||||||
if any(ord(ch) < 0x20 for ch in v):
|
|
||||||
raise ValueError("key contains invalid characters")
|
|
||||||
return v
|
|
||||||
|
|
||||||
def phosg_string(value):
|
|
||||||
return json.dumps(str(value))
|
|
||||||
|
|
||||||
def base_site_license_text(account_id, username):
|
|
||||||
aid_hex = f"0x{int(account_id):X}"
|
|
||||||
uname = phosg_string(username)
|
|
||||||
return (
|
|
||||||
"{\n"
|
|
||||||
" \"BBTeamID\": 0x0,\n"
|
|
||||||
" \"FormatVersion\": 0x1,\n"
|
|
||||||
f" \"AccountID\": {aid_hex},\n"
|
|
||||||
f" \"LastPlayerName\": {uname},\n"
|
|
||||||
" \"DCNTELicenses\": [],\n"
|
|
||||||
" \"BBLicenses\": [],\n"
|
|
||||||
" \"BanEndTime\": 0x0,\n"
|
|
||||||
" \"PCLicenses\": [],\n"
|
|
||||||
" \"AutoReplyMessage\": \"\",\n"
|
|
||||||
" \"GCLicenses\": [],\n"
|
|
||||||
" \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
|
|
||||||
" \"XBLicenses\": [],\n"
|
|
||||||
" \"Flags\": 0x0,\n"
|
|
||||||
" \"Ep3TotalMesetaEarned\": 0x0,\n"
|
|
||||||
" \"Ep3CurrentMeseta\": 0x0,\n"
|
|
||||||
" \"DCLicenses\": [],\n"
|
|
||||||
" \"UserFlags\": 0x0\n"
|
|
||||||
"}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def find_array_span(text, array_name):
|
|
||||||
marker = f'"{array_name}":'
|
|
||||||
marker_pos = text.find(marker)
|
|
||||||
if marker_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
bracket_pos = text.find("[", marker_pos)
|
|
||||||
if bracket_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
depth = 0
|
|
||||||
in_string = False
|
|
||||||
escape = False
|
|
||||||
|
|
||||||
for i in range(bracket_pos, len(text)):
|
|
||||||
ch = text[i]
|
|
||||||
|
|
||||||
if in_string:
|
|
||||||
if escape:
|
|
||||||
escape = False
|
|
||||||
elif ch == "\\":
|
|
||||||
escape = True
|
|
||||||
elif ch == '"':
|
|
||||||
in_string = False
|
|
||||||
else:
|
|
||||||
if ch == '"':
|
|
||||||
in_string = True
|
|
||||||
elif ch == "[":
|
|
||||||
depth += 1
|
|
||||||
elif ch == "]":
|
|
||||||
depth -= 1
|
|
||||||
if depth == 0:
|
|
||||||
return bracket_pos, i + 1
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def replace_license_array(text, array_name, entries):
|
|
||||||
span = find_array_span(text, array_name)
|
|
||||||
if span is None:
|
|
||||||
raise RuntimeError(f"could not find {array_name} in license file")
|
|
||||||
|
|
||||||
start, end = span
|
|
||||||
rendered = "[]" if not entries else "[\n" + ",\n".join(f" {e}" for e in entries) + "\n ]"
|
|
||||||
return text[:start] + rendered + text[end:]
|
|
||||||
|
|
||||||
def render_v2_entry(row):
|
|
||||||
serial_hex = row["serial_number_hex"].upper()
|
|
||||||
secret = phosg_string(row["access_key"])
|
|
||||||
|
|
||||||
if row["game_version"] == "gc_v3":
|
|
||||||
gc_password = row.get("gc_password")
|
|
||||||
if not gc_password:
|
|
||||||
raise RuntimeError("GC V3 key profile is missing its GC password")
|
|
||||||
password = phosg_string(gc_password)
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}, "Password": {password}}}'
|
|
||||||
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
|
|
||||||
|
|
||||||
|
|
||||||
def rewrite_v2_license_arrays(conn, user, account_id):
|
|
||||||
path = canonical_license_path(account_id)
|
|
||||||
path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
|
|
||||||
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT game_version, serial_number_hex, access_key, gc_password
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
|
|
||||||
pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
|
|
||||||
gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
|
|
||||||
|
|
||||||
text = replace_license_array(text, "DCLicenses", dc_entries)
|
|
||||||
text = replace_license_array(text, "PCLicenses", pc_entries)
|
|
||||||
text = replace_license_array(text, "GCLicenses", gc_entries)
|
|
||||||
|
|
||||||
tmp = path.with_suffix(path.suffix + ".tmp")
|
|
||||||
tmp.write_text(text + "\n")
|
|
||||||
tmp.replace(path)
|
|
||||||
|
|
||||||
sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
|
|
||||||
flat_path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
|
|
||||||
flat_tmp.write_text(text + "\n")
|
|
||||||
flat_tmp.replace(flat_path)
|
|
||||||
|
|
||||||
refresh_account_manifest(account_id)
|
|
||||||
enqueue_account_sync(account_id, "v2_key_profile_updated")
|
|
||||||
return path
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys")
|
|
||||||
def list_key_profiles():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"authenticated": False}), 401
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex, created_at, updated_at
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"authenticated": True,
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"regions": sync["regions"],
|
|
||||||
"keys": [{
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
|
||||||
"updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
|
|
||||||
} for row in rows],
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def license_text_has_serial(text, serial_hex):
|
|
||||||
want_hex = (serial_hex or "").upper().lstrip("0") or "0"
|
|
||||||
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
|
|
||||||
got_hex = match.group(1).upper().lstrip("0") or "0"
|
|
||||||
if got_hex == want_hex:
|
|
||||||
return True
|
|
||||||
|
|
||||||
try:
|
|
||||||
want_dec = str(int(serial_hex, 16))
|
|
||||||
except ValueError:
|
|
||||||
want_dec = None
|
|
||||||
|
|
||||||
if want_dec is not None:
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
|
|
||||||
if match.group(1) == want_dec:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def find_existing_key_owner(serial_hex, current_account_id):
|
|
||||||
root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
|
|
||||||
current_ids = {
|
|
||||||
account_id_str(current_account_id),
|
|
||||||
str(int(current_account_id)),
|
|
||||||
}
|
|
||||||
|
|
||||||
def owner_for_license_path(license_path):
|
|
||||||
try:
|
|
||||||
rel = license_path.relative_to(root)
|
|
||||||
parts = rel.parts
|
|
||||||
except Exception:
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
# canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
for i in range(1, len(parts) - 2):
|
|
||||||
if parts[i:i + 2] == ("system", "licenses"):
|
|
||||||
possible = parts[i - 1]
|
|
||||||
if re.fullmatch(r"[0-9]{10}", possible):
|
|
||||||
return possible
|
|
||||||
|
|
||||||
# canonical-system/system/licenses/ACCOUNT.json
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
search_paths = []
|
|
||||||
seen_paths = set()
|
|
||||||
|
|
||||||
for base in (
|
|
||||||
root / "canonical",
|
|
||||||
root / "canonical-system",
|
|
||||||
root / "inbox",
|
|
||||||
):
|
|
||||||
if not base.is_dir():
|
|
||||||
continue
|
|
||||||
|
|
||||||
for license_path in sorted(base.rglob("system/licenses/*.json")):
|
|
||||||
if license_path in seen_paths:
|
|
||||||
continue
|
|
||||||
seen_paths.add(license_path)
|
|
||||||
search_paths.append((license_path, owner_for_license_path(license_path)))
|
|
||||||
|
|
||||||
for license_path, owner_account_id in search_paths:
|
|
||||||
if owner_account_id in current_ids:
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
text = license_path.read_text(errors="ignore")
|
|
||||||
except OSError:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if license_text_has_serial(text, serial_hex):
|
|
||||||
return {
|
|
||||||
"account_id": owner_account_id,
|
|
||||||
"path": str(license_path),
|
|
||||||
}
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/keys/register")
|
|
||||||
def register_key_profile():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
if not user_has_bb_account(conn, user["id"]):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
|
|
||||||
"bb_account_required": True,
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
data = request.get_json(silent=True) or {}
|
|
||||||
game_version = str(data.get("game_version") or "").strip().lower()
|
|
||||||
label = str(data.get("label") or "").strip()[:80]
|
|
||||||
|
|
||||||
if game_version not in SUPPORTED_KEY_VERSIONS:
|
|
||||||
return jsonify({"error": "unsupported game version"}), 400
|
|
||||||
|
|
||||||
try:
|
|
||||||
serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
|
|
||||||
key_secret = normalize_access_key(data.get("access_key"), game_version)
|
|
||||||
gc_password = validate_secret(data.get("password")) if game_version == "gc_v3" else None
|
|
||||||
except ValueError as e:
|
|
||||||
return jsonify({"error": str(e)}), 400
|
|
||||||
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
duplicate = find_existing_key_owner(serial_hex, account_id)
|
|
||||||
if duplicate:
|
|
||||||
return jsonify({
|
|
||||||
"error": "that key is already registered to another account"
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
try:
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO v2_v3_key_profiles (
|
|
||||||
user_id,
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_number_hex,
|
|
||||||
access_key,
|
|
||||||
gc_password
|
|
||||||
) VALUES (%s, %s, %s, %s, %s, %s, %s)
|
|
||||||
RETURNING id
|
|
||||||
""", (
|
|
||||||
user["id"],
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_hex,
|
|
||||||
key_secret,
|
|
||||||
gc_password,
|
|
||||||
))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
except psycopg.errors.UniqueViolation:
|
|
||||||
return jsonify({"error": "that key is already registered to an account"}), 409
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": game_version,
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
|
|
||||||
"label": label,
|
|
||||||
"serial_number_hex": serial_hex,
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys/<int:key_id>/access-key")
|
|
||||||
def get_key_access_key(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before viewing game account keys.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"access_key": row["access_key"],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete("/keys/<int:key_id>")
|
|
||||||
def delete_key_profile(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
cur.execute("""
|
|
||||||
DELETE FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"deleted": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
@@ -1,514 +0,0 @@
|
|||||||
import json
|
|
||||||
import re
|
|
||||||
import os
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
import psycopg
|
|
||||||
|
|
||||||
|
|
||||||
SUPPORTED_KEY_VERSIONS = {
|
|
||||||
"dc_v2": {"label": "DC V2"},
|
|
||||||
"pc_v2": {"label": "PC V2"},
|
|
||||||
"gc_v3": {"label": "GC V3"},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def register_key_routes(
|
|
||||||
app,
|
|
||||||
*,
|
|
||||||
connect,
|
|
||||||
current_user,
|
|
||||||
jsonify,
|
|
||||||
request,
|
|
||||||
account_id_str,
|
|
||||||
bb_account_id,
|
|
||||||
canonical_license_path,
|
|
||||||
refresh_account_manifest,
|
|
||||||
enqueue_account_sync,
|
|
||||||
bb_sync_info,
|
|
||||||
):
|
|
||||||
def ensure_key_profile_table():
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
|
|
||||||
id BIGSERIAL PRIMARY KEY,
|
|
||||||
user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
|
|
||||||
account_id BIGINT NOT NULL,
|
|
||||||
game_version TEXT NOT NULL,
|
|
||||||
label TEXT NOT NULL DEFAULT '',
|
|
||||||
serial_number_hex TEXT NOT NULL,
|
|
||||||
access_key TEXT NOT NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
UNIQUE (game_version, serial_number_hex)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def site_account_id(username):
|
|
||||||
return bb_account_id(username)
|
|
||||||
|
|
||||||
def user_has_bb_account(conn, user_id):
|
|
||||||
with conn.cursor() as cur:
|
|
||||||
cur.execute(
|
|
||||||
"SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
|
|
||||||
(user_id,),
|
|
||||||
)
|
|
||||||
return cur.fetchone() is not None
|
|
||||||
|
|
||||||
def normalize_serial_hex(value, game_version):
|
|
||||||
raw = str(value or "").strip()
|
|
||||||
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("serial number is required")
|
|
||||||
|
|
||||||
if game_version == "dc_v2":
|
|
||||||
v = raw.upper()
|
|
||||||
if v.startswith("0X"):
|
|
||||||
v = v[2:]
|
|
||||||
if not re.fullmatch(r"[0-9A-F]{1,8}", v):
|
|
||||||
raise ValueError("DC V2 serial must be hex, like 4E62F237")
|
|
||||||
return f"{int(v, 16):08X}"
|
|
||||||
|
|
||||||
if game_version == "pc_v2":
|
|
||||||
if not re.fullmatch(r"[0-9]{1,10}", raw):
|
|
||||||
raise ValueError("PC V2 serial must be digits only")
|
|
||||||
n = int(raw, 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("PC V2 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
if game_version == "gc_v3":
|
|
||||||
if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
|
|
||||||
raise ValueError("GC V3 serial must use the dashed format, like 11-3273-6540")
|
|
||||||
n = int(raw.replace("-", ""), 10)
|
|
||||||
if not (0 <= n <= 0xFFFFFFFF):
|
|
||||||
raise ValueError("GC V3 serial is out of range")
|
|
||||||
return f"{n:08X}"
|
|
||||||
|
|
||||||
raise ValueError("unsupported game version")
|
|
||||||
|
|
||||||
def validate_secret(value):
|
|
||||||
v = str(value or "").strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("key is required")
|
|
||||||
if len(v) > 64:
|
|
||||||
raise ValueError("key is too long")
|
|
||||||
if any(ord(ch) < 0x20 for ch in v):
|
|
||||||
raise ValueError("key contains invalid characters")
|
|
||||||
return v
|
|
||||||
|
|
||||||
def phosg_string(value):
|
|
||||||
return json.dumps(str(value))
|
|
||||||
|
|
||||||
def base_site_license_text(account_id, username):
|
|
||||||
aid_hex = f"0x{int(account_id):X}"
|
|
||||||
uname = phosg_string(username)
|
|
||||||
return (
|
|
||||||
"{\n"
|
|
||||||
" \"BBTeamID\": 0x0,\n"
|
|
||||||
" \"FormatVersion\": 0x1,\n"
|
|
||||||
f" \"AccountID\": {aid_hex},\n"
|
|
||||||
f" \"LastPlayerName\": {uname},\n"
|
|
||||||
" \"DCNTELicenses\": [],\n"
|
|
||||||
" \"BBLicenses\": [],\n"
|
|
||||||
" \"BanEndTime\": 0x0,\n"
|
|
||||||
" \"PCLicenses\": [],\n"
|
|
||||||
" \"AutoReplyMessage\": \"\",\n"
|
|
||||||
" \"GCLicenses\": [],\n"
|
|
||||||
" \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
|
|
||||||
" \"XBLicenses\": [],\n"
|
|
||||||
" \"Flags\": 0x0,\n"
|
|
||||||
" \"Ep3TotalMesetaEarned\": 0x0,\n"
|
|
||||||
" \"Ep3CurrentMeseta\": 0x0,\n"
|
|
||||||
" \"DCLicenses\": [],\n"
|
|
||||||
" \"UserFlags\": 0x0\n"
|
|
||||||
"}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def find_array_span(text, array_name):
|
|
||||||
marker = f'"{array_name}":'
|
|
||||||
marker_pos = text.find(marker)
|
|
||||||
if marker_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
bracket_pos = text.find("[", marker_pos)
|
|
||||||
if bracket_pos < 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
depth = 0
|
|
||||||
in_string = False
|
|
||||||
escape = False
|
|
||||||
|
|
||||||
for i in range(bracket_pos, len(text)):
|
|
||||||
ch = text[i]
|
|
||||||
|
|
||||||
if in_string:
|
|
||||||
if escape:
|
|
||||||
escape = False
|
|
||||||
elif ch == "\\":
|
|
||||||
escape = True
|
|
||||||
elif ch == '"':
|
|
||||||
in_string = False
|
|
||||||
else:
|
|
||||||
if ch == '"':
|
|
||||||
in_string = True
|
|
||||||
elif ch == "[":
|
|
||||||
depth += 1
|
|
||||||
elif ch == "]":
|
|
||||||
depth -= 1
|
|
||||||
if depth == 0:
|
|
||||||
return bracket_pos, i + 1
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def replace_license_array(text, array_name, entries):
|
|
||||||
span = find_array_span(text, array_name)
|
|
||||||
if span is None:
|
|
||||||
raise RuntimeError(f"could not find {array_name} in license file")
|
|
||||||
|
|
||||||
start, end = span
|
|
||||||
rendered = "[]" if not entries else "[\n" + ",\n".join(f" {e}" for e in entries) + "\n ]"
|
|
||||||
return text[:start] + rendered + text[end:]
|
|
||||||
|
|
||||||
def render_v2_entry(row):
|
|
||||||
serial_hex = row["serial_number_hex"].upper()
|
|
||||||
secret = phosg_string(row["access_key"])
|
|
||||||
return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
|
|
||||||
|
|
||||||
|
|
||||||
def rewrite_v2_license_arrays(conn, user, account_id):
|
|
||||||
path = canonical_license_path(account_id)
|
|
||||||
path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
|
|
||||||
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
|
|
||||||
pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
|
|
||||||
gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
|
|
||||||
|
|
||||||
text = replace_license_array(text, "DCLicenses", dc_entries)
|
|
||||||
text = replace_license_array(text, "PCLicenses", pc_entries)
|
|
||||||
text = replace_license_array(text, "GCLicenses", gc_entries)
|
|
||||||
|
|
||||||
tmp = path.with_suffix(path.suffix + ".tmp")
|
|
||||||
tmp.write_text(text + "\n")
|
|
||||||
tmp.replace(path)
|
|
||||||
|
|
||||||
sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
|
|
||||||
flat_path.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
|
|
||||||
flat_tmp.write_text(text + "\n")
|
|
||||||
flat_tmp.replace(flat_path)
|
|
||||||
|
|
||||||
refresh_account_manifest(account_id)
|
|
||||||
enqueue_account_sync(account_id, "v2_key_profile_updated")
|
|
||||||
return path
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys")
|
|
||||||
def list_key_profiles():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"authenticated": False}), 401
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex, created_at, updated_at
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE user_id = %s
|
|
||||||
ORDER BY id
|
|
||||||
""", (user["id"],))
|
|
||||||
rows = list(cur.fetchall())
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"authenticated": True,
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"regions": sync["regions"],
|
|
||||||
"keys": [{
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"created_at": row["created_at"].isoformat() if row["created_at"] else None,
|
|
||||||
"updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
|
|
||||||
} for row in rows],
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def license_text_has_serial(text, serial_hex):
|
|
||||||
want_hex = (serial_hex or "").upper().lstrip("0") or "0"
|
|
||||||
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
|
|
||||||
got_hex = match.group(1).upper().lstrip("0") or "0"
|
|
||||||
if got_hex == want_hex:
|
|
||||||
return True
|
|
||||||
|
|
||||||
try:
|
|
||||||
want_dec = str(int(serial_hex, 16))
|
|
||||||
except ValueError:
|
|
||||||
want_dec = None
|
|
||||||
|
|
||||||
if want_dec is not None:
|
|
||||||
for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
|
|
||||||
if match.group(1) == want_dec:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def find_existing_key_owner(serial_hex, current_account_id):
|
|
||||||
root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
|
|
||||||
|
|
||||||
current_ids = {
|
|
||||||
account_id_str(current_account_id),
|
|
||||||
str(int(current_account_id)),
|
|
||||||
}
|
|
||||||
|
|
||||||
def owner_for_license_path(license_path):
|
|
||||||
try:
|
|
||||||
rel = license_path.relative_to(root)
|
|
||||||
parts = rel.parts
|
|
||||||
except Exception:
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
# canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
# inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
|
|
||||||
for i in range(1, len(parts) - 2):
|
|
||||||
if parts[i:i + 2] == ("system", "licenses"):
|
|
||||||
possible = parts[i - 1]
|
|
||||||
if re.fullmatch(r"[0-9]{10}", possible):
|
|
||||||
return possible
|
|
||||||
|
|
||||||
# canonical-system/system/licenses/ACCOUNT.json
|
|
||||||
return license_path.stem
|
|
||||||
|
|
||||||
search_paths = []
|
|
||||||
seen_paths = set()
|
|
||||||
|
|
||||||
for base in (
|
|
||||||
root / "canonical",
|
|
||||||
root / "canonical-system",
|
|
||||||
root / "inbox",
|
|
||||||
):
|
|
||||||
if not base.is_dir():
|
|
||||||
continue
|
|
||||||
|
|
||||||
for license_path in sorted(base.rglob("system/licenses/*.json")):
|
|
||||||
if license_path in seen_paths:
|
|
||||||
continue
|
|
||||||
seen_paths.add(license_path)
|
|
||||||
search_paths.append((license_path, owner_for_license_path(license_path)))
|
|
||||||
|
|
||||||
for license_path, owner_account_id in search_paths:
|
|
||||||
if owner_account_id in current_ids:
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
|
||||||
text = license_path.read_text(errors="ignore")
|
|
||||||
except OSError:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if license_text_has_serial(text, serial_hex):
|
|
||||||
return {
|
|
||||||
"account_id": owner_account_id,
|
|
||||||
"path": str(license_path),
|
|
||||||
}
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/keys/register")
|
|
||||||
def register_key_profile():
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
if not user_has_bb_account(conn, user["id"]):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
|
|
||||||
"bb_account_required": True,
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
data = request.get_json(silent=True) or {}
|
|
||||||
game_version = str(data.get("game_version") or "").strip().lower()
|
|
||||||
label = str(data.get("label") or "").strip()[:80]
|
|
||||||
|
|
||||||
if game_version not in SUPPORTED_KEY_VERSIONS:
|
|
||||||
return jsonify({"error": "unsupported game version"}), 400
|
|
||||||
|
|
||||||
try:
|
|
||||||
serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
|
|
||||||
key_secret = validate_secret(data.get("access_key"))
|
|
||||||
except ValueError as e:
|
|
||||||
return jsonify({"error": str(e)}), 400
|
|
||||||
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
duplicate = find_existing_key_owner(serial_hex, account_id)
|
|
||||||
if duplicate:
|
|
||||||
return jsonify({
|
|
||||||
"error": "that key is already registered to another account"
|
|
||||||
}), 409
|
|
||||||
|
|
||||||
try:
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
INSERT INTO v2_v3_key_profiles (
|
|
||||||
user_id,
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_number_hex,
|
|
||||||
access_key
|
|
||||||
) VALUES (%s, %s, %s, %s, %s, %s)
|
|
||||||
RETURNING id
|
|
||||||
""", (
|
|
||||||
user["id"],
|
|
||||||
account_id,
|
|
||||||
game_version,
|
|
||||||
label,
|
|
||||||
serial_hex,
|
|
||||||
key_secret,
|
|
||||||
))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
except psycopg.errors.UniqueViolation:
|
|
||||||
return jsonify({"error": "that key is already registered to an account"}), 409
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": game_version,
|
|
||||||
"game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
|
|
||||||
"label": label,
|
|
||||||
"serial_number_hex": serial_hex,
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/keys/<int:key_id>/access-key")
|
|
||||||
def get_key_access_key(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before viewing game account keys.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, serial_number_hex, access_key
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"key": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
"access_key": row["access_key"],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete("/keys/<int:key_id>")
|
|
||||||
def delete_key_profile(key_id):
|
|
||||||
user = current_user()
|
|
||||||
if not user:
|
|
||||||
return jsonify({"error": "not authenticated"}), 401
|
|
||||||
|
|
||||||
if not user.get("email_verified_at"):
|
|
||||||
return jsonify({
|
|
||||||
"error": "Please verify your email before changing game account settings.",
|
|
||||||
"email_required": True,
|
|
||||||
}), 403
|
|
||||||
|
|
||||||
ensure_key_profile_table()
|
|
||||||
account_id = site_account_id(user["username"])
|
|
||||||
|
|
||||||
with connect() as conn:
|
|
||||||
with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
|
|
||||||
cur.execute("""
|
|
||||||
SELECT id, game_version, label, serial_number_hex
|
|
||||||
FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
LIMIT 1
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
row = cur.fetchone()
|
|
||||||
|
|
||||||
if not row:
|
|
||||||
return jsonify({"error": "key profile not found"}), 404
|
|
||||||
|
|
||||||
cur.execute("""
|
|
||||||
DELETE FROM v2_v3_key_profiles
|
|
||||||
WHERE id = %s AND user_id = %s
|
|
||||||
""", (key_id, user["id"]))
|
|
||||||
|
|
||||||
rewrite_v2_license_arrays(conn, user, account_id)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
sync = bb_sync_info(account_id)
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
"ok": True,
|
|
||||||
"deleted": {
|
|
||||||
"id": row["id"],
|
|
||||||
"game_version": row["game_version"],
|
|
||||||
"label": row["label"],
|
|
||||||
"serial_number_hex": row["serial_number_hex"],
|
|
||||||
},
|
|
||||||
"sync_status": sync["status"],
|
|
||||||
"account_id": account_id_str(account_id),
|
|
||||||
})
|
|
||||||
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
cd /home/rbatty/.local/share/psopeeps_site
|
|
||||||
|
|
||||||
out="site/generated/hardcore-leaderboard-points.json"
|
|
||||||
mkdir -p "$(dirname "$out")"
|
|
||||||
|
|
||||||
tmp="$(mktemp "${out}.tmp.XXXXXX")"
|
|
||||||
trap 'rm -f "$tmp"' EXIT
|
|
||||||
|
|
||||||
docker exec -i psopeeps-web-app python - <<'PY' > "$tmp"
|
|
||||||
from app import _hc_combined_payload, _hc_points_row
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
import json
|
|
||||||
|
|
||||||
combined, errors = _hc_combined_payload()
|
|
||||||
|
|
||||||
rows = []
|
|
||||||
for source_row in combined:
|
|
||||||
points_row = _hc_points_row(source_row)
|
|
||||||
|
|
||||||
rows.append({
|
|
||||||
"PlayerName": (
|
|
||||||
points_row.get("PlayerName")
|
|
||||||
or points_row.get("CharacterName")
|
|
||||||
or source_row.get("character_name")
|
|
||||||
or ""
|
|
||||||
),
|
|
||||||
"Points": int(points_row.get("Points") or points_row.get("TotalPoints") or 0),
|
|
||||||
"Class": (
|
|
||||||
points_row.get("Class")
|
|
||||||
or source_row.get("character_class")
|
|
||||||
or ""
|
|
||||||
),
|
|
||||||
"SecID": (
|
|
||||||
points_row.get("SecID")
|
|
||||||
or source_row.get("section_id")
|
|
||||||
or ""
|
|
||||||
),
|
|
||||||
"Kills": int(points_row.get("Kills") or points_row.get("TotalKills") or source_row.get("total_enemies_killed") or 0),
|
|
||||||
"PlayTimeSeconds": int(points_row.get("PlayTimeSeconds") or source_row.get("play_time_seconds") or 0),
|
|
||||||
"Alive": bool(points_row.get("Alive", True)),
|
|
||||||
"Level": int(points_row.get("Level") or source_row.get("level") or 0),
|
|
||||||
"TotalEXP": int(points_row.get("TotalEXP") or source_row.get("total_exp") or 0),
|
|
||||||
})
|
|
||||||
|
|
||||||
rows.sort(key=lambda r: r["Points"], reverse=True)
|
|
||||||
|
|
||||||
payload = {
|
|
||||||
"generated_at": datetime.now(timezone.utc).isoformat().replace("+00:00", "Z"),
|
|
||||||
"stale_after_seconds": 600,
|
|
||||||
"errors": errors,
|
|
||||||
"rows": rows[:100],
|
|
||||||
}
|
|
||||||
|
|
||||||
print(json.dumps(payload, separators=(",", ":")))
|
|
||||||
PY
|
|
||||||
|
|
||||||
python3 -m json.tool "$tmp" >/dev/null
|
|
||||||
mv -f "$tmp" "$out"
|
|
||||||
trap - EXIT
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
import json
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
SOURCE = Path("source-bestiary/local-newserv/system/tables/battle-params.json")
|
|
||||||
OUT = Path("site/generated/bestiary/bb")
|
|
||||||
|
|
||||||
DIFFICULTY_ORDER = {
|
|
||||||
"Normal": 0,
|
|
||||||
"Hard": 1,
|
|
||||||
"Very Hard": 2,
|
|
||||||
"Ultimate": 3,
|
|
||||||
}
|
|
||||||
|
|
||||||
def label_episode(table_name):
|
|
||||||
ep, mode = table_name.split("-", 1)
|
|
||||||
return ep.replace("Episode", "Episode "), mode
|
|
||||||
|
|
||||||
def enemy_label(value):
|
|
||||||
return str(value).replace("_", " ").title()
|
|
||||||
|
|
||||||
def main():
|
|
||||||
data = json.loads(SOURCE.read_text())
|
|
||||||
OUT.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
rows = []
|
|
||||||
|
|
||||||
for table_name, difficulties in data.items():
|
|
||||||
episode, mode = label_episode(table_name)
|
|
||||||
|
|
||||||
for difficulty, entries in difficulties.items():
|
|
||||||
for entry in entries:
|
|
||||||
stats = entry.get("Stats", {})
|
|
||||||
resist = entry.get("ResistData", {})
|
|
||||||
enemies = stats.get("Enemies") or []
|
|
||||||
|
|
||||||
for enemy in enemies:
|
|
||||||
rows.append({
|
|
||||||
"version": "bb",
|
|
||||||
"episode": episode,
|
|
||||||
"mode": mode,
|
|
||||||
"difficulty": difficulty,
|
|
||||||
"enemy": enemy_label(enemy),
|
|
||||||
"enemy_key": enemy,
|
|
||||||
"bp_index": entry.get("BPIndex"),
|
|
||||||
"hp": stats.get("HP", 0),
|
|
||||||
"atp": stats.get("ATP", 0),
|
|
||||||
"dfp": stats.get("DFP", 0),
|
|
||||||
"mst": stats.get("MST", 0),
|
|
||||||
"ata": stats.get("ATA", 0),
|
|
||||||
"evp": stats.get("EVP", 0),
|
|
||||||
"lck": stats.get("LCK", 0),
|
|
||||||
"esp": stats.get("ESP", 0),
|
|
||||||
"exp": stats.get("EXP", 0),
|
|
||||||
"meseta": stats.get("Meseta", 0),
|
|
||||||
"efr": resist.get("EFR", 0),
|
|
||||||
"eic": resist.get("EIC", 0),
|
|
||||||
"eth": resist.get("ETH", 0),
|
|
||||||
"elt": resist.get("ELT", 0),
|
|
||||||
"edk": resist.get("EDK", 0),
|
|
||||||
})
|
|
||||||
|
|
||||||
rows.sort(key=lambda row: (
|
|
||||||
row["episode"],
|
|
||||||
row["mode"],
|
|
||||||
DIFFICULTY_ORDER.get(row["difficulty"], 999),
|
|
||||||
row["enemy"],
|
|
||||||
row["bp_index"] if row["bp_index"] is not None else 9999,
|
|
||||||
))
|
|
||||||
|
|
||||||
(OUT / "bb.json").write_text(json.dumps(rows, indent=2, sort_keys=True) + "\n")
|
|
||||||
(OUT / "index.json").write_text(json.dumps({
|
|
||||||
"mode": "bestiary",
|
|
||||||
"label": "BB",
|
|
||||||
"tables": [{
|
|
||||||
"version": "bb",
|
|
||||||
"label": "BB",
|
|
||||||
"path": "bb.json",
|
|
||||||
"rows": len(rows),
|
|
||||||
}],
|
|
||||||
}, indent=2, sort_keys=True) + "\n")
|
|
||||||
|
|
||||||
print(f"bb: {len(rows)} rows -> {OUT / 'bb.json'}")
|
|
||||||
print(f"index -> {OUT / 'index.json'}")
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -1,187 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
import json
|
|
||||||
import re
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
NEWSERV = Path.home() / ".local/share/github/psopeeps-newserv"
|
|
||||||
PEEPS_OUT = Path("site/generated/drops/peeps")
|
|
||||||
HARDCORE_OUT = Path("site/generated/drops/hardcore")
|
|
||||||
|
|
||||||
PEEPS_TABLES = {
|
|
||||||
"v1": NEWSERV / "system/tables/rare-table-v1.json",
|
|
||||||
"v2": NEWSERV / "system/tables/rare-table-v2.json",
|
|
||||||
"v3": NEWSERV / "system/tables/rare-table-v3.json",
|
|
||||||
"bb": NEWSERV / "system/tables/rare-table-v4.json",
|
|
||||||
}
|
|
||||||
|
|
||||||
HARDCORE_TABLES = {
|
|
||||||
"bb": Path("source-drops/hardcore/rare-table-v4.json"),
|
|
||||||
}
|
|
||||||
|
|
||||||
def strip_json_comments(text):
|
|
||||||
out = []
|
|
||||||
in_str = False
|
|
||||||
esc = False
|
|
||||||
i = 0
|
|
||||||
while i < len(text):
|
|
||||||
c = text[i]
|
|
||||||
n = text[i + 1] if i + 1 < len(text) else ""
|
|
||||||
|
|
||||||
if in_str:
|
|
||||||
out.append(c)
|
|
||||||
if esc:
|
|
||||||
esc = False
|
|
||||||
elif c == "\\":
|
|
||||||
esc = True
|
|
||||||
elif c == '"':
|
|
||||||
in_str = False
|
|
||||||
i += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if c == '"':
|
|
||||||
in_str = True
|
|
||||||
out.append(c)
|
|
||||||
i += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if c == "/" and n == "/":
|
|
||||||
while i < len(text) and text[i] not in "\r\n":
|
|
||||||
i += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
out.append(c)
|
|
||||||
i += 1
|
|
||||||
|
|
||||||
return "".join(out)
|
|
||||||
|
|
||||||
def quote_hex_numbers(text):
|
|
||||||
return re.sub(r'(?<!["\w])0x[0-9A-Fa-f]+', lambda m: f'"{m.group(0)}"', text)
|
|
||||||
|
|
||||||
|
|
||||||
def remove_trailing_commas(text):
|
|
||||||
out = []
|
|
||||||
in_str = False
|
|
||||||
esc = False
|
|
||||||
i = 0
|
|
||||||
|
|
||||||
while i < len(text):
|
|
||||||
c = text[i]
|
|
||||||
|
|
||||||
if in_str:
|
|
||||||
out.append(c)
|
|
||||||
if esc:
|
|
||||||
esc = False
|
|
||||||
elif c == "\\":
|
|
||||||
esc = True
|
|
||||||
elif c == '"':
|
|
||||||
in_str = False
|
|
||||||
i += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if c == '"':
|
|
||||||
in_str = True
|
|
||||||
out.append(c)
|
|
||||||
i += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if c == ",":
|
|
||||||
j = i + 1
|
|
||||||
while j < len(text) and text[j] in " \t\r\n":
|
|
||||||
j += 1
|
|
||||||
if j < len(text) and text[j] in "}]":
|
|
||||||
i += 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
out.append(c)
|
|
||||||
i += 1
|
|
||||||
|
|
||||||
return "".join(out)
|
|
||||||
|
|
||||||
def load_newserv_jsonish(path):
|
|
||||||
text = path.read_text(encoding="utf-8", errors="replace")
|
|
||||||
text = strip_json_comments(text)
|
|
||||||
text = quote_hex_numbers(text)
|
|
||||||
text = remove_trailing_commas(text)
|
|
||||||
return json.loads(text)
|
|
||||||
|
|
||||||
def normalize_item_code(value):
|
|
||||||
if isinstance(value, str) and value.startswith("0x"):
|
|
||||||
return "0x" + value[2:].upper()
|
|
||||||
if isinstance(value, int):
|
|
||||||
return f"0x{value:06X}"
|
|
||||||
return str(value)
|
|
||||||
|
|
||||||
def flatten_table(version, table):
|
|
||||||
rows = []
|
|
||||||
|
|
||||||
for game_mode, episodes in table.items():
|
|
||||||
if not isinstance(episodes, dict):
|
|
||||||
continue
|
|
||||||
for episode, difficulties in episodes.items():
|
|
||||||
if not isinstance(difficulties, dict):
|
|
||||||
continue
|
|
||||||
for difficulty, section_ids in difficulties.items():
|
|
||||||
if not isinstance(section_ids, dict):
|
|
||||||
continue
|
|
||||||
for section_id, sources in section_ids.items():
|
|
||||||
if not isinstance(sources, dict):
|
|
||||||
continue
|
|
||||||
for source, drops in sources.items():
|
|
||||||
if not isinstance(drops, list):
|
|
||||||
continue
|
|
||||||
for drop in drops:
|
|
||||||
if not isinstance(drop, list) or len(drop) < 2:
|
|
||||||
continue
|
|
||||||
|
|
||||||
rows.append({
|
|
||||||
"version": version,
|
|
||||||
"mode": str(game_mode),
|
|
||||||
"episode": str(episode),
|
|
||||||
"difficulty": str(difficulty),
|
|
||||||
"section_id": str(section_id),
|
|
||||||
"source": str(source),
|
|
||||||
"rate": str(drop[0]),
|
|
||||||
"item_code": normalize_item_code(drop[1]),
|
|
||||||
"item": str(drop[2]) if len(drop) >= 3 and drop[2] else "",
|
|
||||||
})
|
|
||||||
|
|
||||||
return rows
|
|
||||||
|
|
||||||
def write_group(mode, label, tables, out_dir):
|
|
||||||
out_dir.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
index = {
|
|
||||||
"mode": mode,
|
|
||||||
"label": label,
|
|
||||||
"tables": [],
|
|
||||||
}
|
|
||||||
|
|
||||||
labels = {"v1": "V1", "v2": "V2", "v3": "V3", "bb": "BB"}
|
|
||||||
|
|
||||||
for version, src in tables.items():
|
|
||||||
table = load_newserv_jsonish(src)
|
|
||||||
rows = flatten_table(version, table)
|
|
||||||
|
|
||||||
out_name = f"{version}.json"
|
|
||||||
out_path = out_dir / out_name
|
|
||||||
out_path.write_text(json.dumps(rows, indent=2, sort_keys=True) + "\n")
|
|
||||||
|
|
||||||
index["tables"].append({
|
|
||||||
"version": version,
|
|
||||||
"label": labels[version],
|
|
||||||
"path": out_name,
|
|
||||||
"rows": len(rows),
|
|
||||||
})
|
|
||||||
|
|
||||||
print(f"{mode} {version}: {len(rows)} rows -> {out_path}")
|
|
||||||
|
|
||||||
index_path = out_dir / "index.json"
|
|
||||||
index_path.write_text(json.dumps(index, indent=2, sort_keys=True) + "\n")
|
|
||||||
print(f"{mode} index -> {index_path}")
|
|
||||||
|
|
||||||
def main():
|
|
||||||
write_group("peeps", "Peeps", PEEPS_TABLES, PEEPS_OUT)
|
|
||||||
write_group("hardcore", "Hardcore", HARDCORE_TABLES, HARDCORE_OUT)
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import urllib.parse
|
|
||||||
import urllib.request
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
PROMETHEUS_URL = os.environ.get("PROMETHEUS_URL", "http://5.0.0.20:9090").rstrip("/")
|
|
||||||
SOURCE_URL = os.environ.get("SERVER_STATUS_SOURCE_URL", "").strip()
|
|
||||||
OUTPUT_PATH = Path(os.environ.get("SERVER_STATUS_JSON", "site/server-status.json"))
|
|
||||||
TIMEOUT_SECONDS = float(os.environ.get("PROMETHEUS_TIMEOUT_SECONDS", "5"))
|
|
||||||
|
|
||||||
def write_data(data):
|
|
||||||
if not isinstance(data.get("servers"), list):
|
|
||||||
raise SystemExit("server status JSON missing servers array")
|
|
||||||
|
|
||||||
data["generated_at"] = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
|
|
||||||
|
|
||||||
OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
tmp_path = OUTPUT_PATH.with_name(OUTPUT_PATH.name + ".tmp")
|
|
||||||
tmp_path.write_text(json.dumps(data, separators=(",", ":")) + "\n")
|
|
||||||
os.replace(tmp_path, OUTPUT_PATH)
|
|
||||||
print(f"wrote {OUTPUT_PATH}")
|
|
||||||
|
|
||||||
def prom_value(query):
|
|
||||||
url = PROMETHEUS_URL + "/api/v1/query?" + urllib.parse.urlencode({"query": query})
|
|
||||||
with urllib.request.urlopen(url, timeout=TIMEOUT_SECONDS) as response:
|
|
||||||
body = json.loads(response.read().decode("utf-8"))
|
|
||||||
|
|
||||||
result = body.get("data", {}).get("result", [])
|
|
||||||
if not result:
|
|
||||||
return 0
|
|
||||||
return int(float(result[0]["value"][1]))
|
|
||||||
|
|
||||||
def q(metric, labels):
|
|
||||||
label_text = ",".join(f'{key}="{value}"' for key, value in labels.items())
|
|
||||||
return f"sum({metric}{{{label_text}}}) or vector(0)"
|
|
||||||
|
|
||||||
def newserv(region, service, ship, version):
|
|
||||||
return prom_value(q("pso_newserv_clients_connected", {
|
|
||||||
"region": region,
|
|
||||||
"service": service,
|
|
||||||
"ship": ship,
|
|
||||||
"version": version,
|
|
||||||
}))
|
|
||||||
|
|
||||||
def adhoc(region, game):
|
|
||||||
return prom_value(q("psppeeps_adhoc_connected_clients_by_product", {
|
|
||||||
"region": region,
|
|
||||||
"service": f"{region}-psppeeps-adhoc",
|
|
||||||
"ship": "psp",
|
|
||||||
"game": game,
|
|
||||||
}))
|
|
||||||
|
|
||||||
def row(label, players):
|
|
||||||
return {"label": label, "players": int(players)}
|
|
||||||
|
|
||||||
def main():
|
|
||||||
if SOURCE_URL:
|
|
||||||
with urllib.request.urlopen(SOURCE_URL, timeout=TIMEOUT_SECONDS) as response:
|
|
||||||
write_data(json.loads(response.read().decode("utf-8")))
|
|
||||||
return
|
|
||||||
|
|
||||||
us_alis_v2 = newserv("us", "us-newserv-live", "live", "v2")
|
|
||||||
us_alis_v3 = newserv("us", "us-newserv-live", "live", "v3")
|
|
||||||
us_alis_bb = newserv("us", "us-newserv-live", "live", "v4")
|
|
||||||
us_abion_hcbb = newserv("us", "us-newserv-hardcore", "hardcore", "v4")
|
|
||||||
us_adhoc_psp1 = adhoc("us", "psp1")
|
|
||||||
us_adhoc_psp2i = adhoc("us", "psp2i")
|
|
||||||
|
|
||||||
eu_palma_v2 = newserv("eu", "eu-newserv-live", "live", "v2")
|
|
||||||
eu_palma_v3 = newserv("eu", "eu-newserv-live", "live", "v3")
|
|
||||||
eu_palma_bb = newserv("eu", "eu-newserv-live", "live", "v4")
|
|
||||||
eu_aiedo_hcbb = newserv("eu", "eu-newserv-hardcore", "hardcore", "v4")
|
|
||||||
eu_adhoc_psp1 = adhoc("eu", "psp1")
|
|
||||||
eu_adhoc_psp2i = adhoc("eu", "psp2i")
|
|
||||||
|
|
||||||
write_data({
|
|
||||||
"servers": [
|
|
||||||
{
|
|
||||||
"label": "US Server",
|
|
||||||
"players": us_alis_v2 + us_alis_v3 + us_alis_bb + us_abion_hcbb + us_adhoc_psp1 + us_adhoc_psp2i,
|
|
||||||
"ships": [
|
|
||||||
{"label": "Alis", "rows": [row("V2", us_alis_v2), row("V3", us_alis_v3), row("BB", us_alis_bb)]},
|
|
||||||
{"label": "Abion", "rows": [row("HC/BB", us_abion_hcbb)]},
|
|
||||||
{"label": "AdHoc-US", "rows": [row("PSP1", us_adhoc_psp1), row("PSP2i", us_adhoc_psp2i)]},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "EU Server",
|
|
||||||
"players": eu_palma_v2 + eu_palma_v3 + eu_palma_bb + eu_aiedo_hcbb + eu_adhoc_psp1 + eu_adhoc_psp2i,
|
|
||||||
"ships": [
|
|
||||||
{"label": "Palma", "rows": [row("V2", eu_palma_v2), row("V3", eu_palma_v3), row("BB", eu_palma_bb)]},
|
|
||||||
{"label": "Aiedo", "rows": [row("HC/BB", eu_aiedo_hcbb)]},
|
|
||||||
{"label": "AdHoc-EU", "rows": [row("PSP1", eu_adhoc_psp1), row("PSP2i", eu_adhoc_psp2i)]},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
+10
-1
@@ -145,7 +145,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="footer-legal" aria-label="Site license and software credits">
|
<div class="footer-legal" aria-label="Site license and software credits">
|
||||||
<p>
|
<p>
|
||||||
All content on this website is licensed under
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
|
||||||
|
is licensed under
|
||||||
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
All written content on this website is licensed under
|
||||||
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
@@ -154,6 +159,10 @@
|
|||||||
from fuzziqersoftware.
|
from fuzziqersoftware.
|
||||||
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
PSO Peeps is hosted and maintained by
|
||||||
|
<a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -92,7 +92,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="footer-legal" aria-label="Site license and software credits">
|
<div class="footer-legal" aria-label="Site license and software credits">
|
||||||
<p>
|
<p>
|
||||||
All content on this website is licensed under
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
|
||||||
|
is licensed under
|
||||||
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
All written content on this website is licensed under
|
||||||
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
@@ -101,6 +106,10 @@
|
|||||||
from fuzziqersoftware.
|
from fuzziqersoftware.
|
||||||
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
PSO Peeps is hosted and maintained by
|
||||||
|
<a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+10
-1
@@ -145,7 +145,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="footer-legal" aria-label="Site license and software credits">
|
<div class="footer-legal" aria-label="Site license and software credits">
|
||||||
<p>
|
<p>
|
||||||
All content on this website is licensed under
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
|
||||||
|
is licensed under
|
||||||
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
All written content on this website is licensed under
|
||||||
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
@@ -154,6 +159,10 @@
|
|||||||
from fuzziqersoftware.
|
from fuzziqersoftware.
|
||||||
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
PSO Peeps is hosted and maintained by
|
||||||
|
<a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+10
-1
@@ -102,7 +102,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="footer-legal" aria-label="Site license and software credits">
|
<div class="footer-legal" aria-label="Site license and software credits">
|
||||||
<p>
|
<p>
|
||||||
All content on this website is licensed under
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
|
||||||
|
is licensed under
|
||||||
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
All written content on this website is licensed under
|
||||||
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
@@ -111,6 +116,10 @@
|
|||||||
from fuzziqersoftware.
|
from fuzziqersoftware.
|
||||||
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
PSO Peeps is hosted and maintained by
|
||||||
|
<a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+10
-1
@@ -115,7 +115,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="footer-legal" aria-label="Site license and software credits">
|
<div class="footer-legal" aria-label="Site license and software credits">
|
||||||
<p>
|
<p>
|
||||||
All content on this website is licensed under
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
|
||||||
|
is licensed under
|
||||||
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
All written content on this website is licensed under
|
||||||
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
@@ -124,6 +129,10 @@
|
|||||||
from fuzziqersoftware.
|
from fuzziqersoftware.
|
||||||
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
PSO Peeps is hosted and maintained by
|
||||||
|
<a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+10
-1
@@ -134,7 +134,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="footer-legal" aria-label="Site license and software credits">
|
<div class="footer-legal" aria-label="Site license and software credits">
|
||||||
<p>
|
<p>
|
||||||
All content on this website is licensed under
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
|
||||||
|
is licensed under
|
||||||
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
All written content on this website is licensed under
|
||||||
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
@@ -143,6 +148,10 @@
|
|||||||
from fuzziqersoftware.
|
from fuzziqersoftware.
|
||||||
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
PSO Peeps is hosted and maintained by
|
||||||
|
<a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+10
-1
@@ -71,7 +71,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="footer-legal" aria-label="Site license and software credits">
|
<div class="footer-legal" aria-label="Site license and software credits">
|
||||||
<p>
|
<p>
|
||||||
All content on this website is licensed under
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
|
||||||
|
is licensed under
|
||||||
|
<a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
All written content on this website is licensed under
|
||||||
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
@@ -80,6 +85,10 @@
|
|||||||
from fuzziqersoftware.
|
from fuzziqersoftware.
|
||||||
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
<a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
PSO Peeps is hosted and maintained by
|
||||||
|
<a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user