From f33bc5c18d163a78ebc7feb99a7bb34536931892 Mon Sep 17 00:00:00 2001 From: yincong Date: Wed, 4 Mar 2026 16:17:41 +0800 Subject: [PATCH] update log --- .gitignore | 3 +- LICENSE | 683 +++++++++++++++++++++++++++++++ frida-wechat.md | 2 +- frida/image.js | 28 +- frida/receiver.js | 4 +- frida/text.js | 14 +- onebot/go.mod | 8 +- onebot/go.sum | 21 +- onebot/http.go | 18 +- onebot/logger.go | 151 +++++++ onebot/main.go | 54 +-- onebot/msg.go | 6 +- onebot/script.js | 12 +- onebot/utils.go | 11 +- onebot/websocket.go | 36 +- onebot/worker.go | 22 +- todo_list | 3 + wechat_version/4_1_7_57_mac.json | 22 + 18 files changed, 990 insertions(+), 108 deletions(-) create mode 100644 LICENSE create mode 100644 onebot/logger.go create mode 100644 todo_list create mode 100644 wechat_version/4_1_7_57_mac.json diff --git a/.gitignore b/.gitignore index a6d822d..df81650 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ onebot/onebot *.tar.gz release onebot/audio -onebot/image \ No newline at end of file +onebot/image +onebot/log \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9268dc7 --- /dev/null +++ b/LICENSE @@ -0,0 +1,683 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2026 yincongcyincong + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/frida-wechat.md b/frida-wechat.md index 041f87e..2928301 100644 --- a/frida-wechat.md +++ b/frida-wechat.md @@ -1,4 +1,4 @@ -触发 STNManager__MMStartTask （ida搜 MMStartTask） +触发 STNManager__MMStartTask （ida搜 [MMStartTask]()） 图片hook: startUploadMedia （ida搜）, OnUploadCompleted （ce查） startUploadMedia 上传图片，OnUploadCompleted 上传图片完成后的回调 加密后的图片在_OnRecvFileData diff --git a/frida/image.js b/frida/image.js index bae82e4..c8fab9c 100644 --- a/frida/image.js +++ b/frida/image.js @@ -101,20 +101,20 @@ function generateBytes(n) { // 双方公共使用的地址 var triggerX1Payload; var triggerX0; -var req2bufEnterAddr = baseAddr.add(0x36F1614); -var req2bufExitAddr = baseAddr.add(0x36F27EC); -var sendFuncAddr = baseAddr.add(0x47F1888); +var req2bufEnterAddr = baseAddr.add(0x36FC204); +var req2bufExitAddr = baseAddr.add(0x36FD3DC); +var sendFuncAddr = baseAddr.add(0x47FE448); var insertMsgAddr = ptr(0); var sendMsgType = ""; // 图片消息全局变量 -var uploadImageAddr = baseAddr.add(0x4938E08); -var imgProtobufAddr = baseAddr.add(0x2455574); -var patchImgProtobufFunc1 = baseAddr.add(0x2455530) -var patchImgProtobufFunc2 = baseAddr.add(0x2455550); -var imgProtobufDeleteAddr = baseAddr.add(0x245558C); -var CndOnCompleteAddr = baseAddr.add(0x36B03A0); -var imgMessageCallbackFunc1 = baseAddr.add(0x8780AD8); +var uploadImageAddr = baseAddr.add(0x49459C8); +var imgProtobufAddr = baseAddr.add(0x245D164); +var patchImgProtobufFunc1 = baseAddr.add(0x245D120) +var patchImgProtobufFunc2 = baseAddr.add(0x245D140); +var imgProtobufDeleteAddr = baseAddr.add(0x245D17C); +var CndOnCompleteAddr = baseAddr.add(0x36BAFC0); +var imgMessageCallbackFunc1 = baseAddr.add(0x8790DD8); var uploadImageX1; var imgCgiAddr = ptr(0); @@ -673,7 +673,7 @@ function patchCdnOnComplete() { setImmediate(patchCdnOnComplete) function attachGetCallbackFromWrapper() { - Interceptor.attach(baseAddr.add(0x49068CC), { + Interceptor.attach(baseAddr.add(0x491348C), { onEnter: function (args) { const tmpFileId = this.context.x1.readPointer().readUtf8String(); const fileId = imageIdAddr.readUtf8String(); @@ -682,13 +682,13 @@ function attachGetCallbackFromWrapper() { return } - uploadCallback.add(0x10).writePointer(baseAddr.add(0x36AFBEC)); + uploadCallback.add(0x10).writePointer(baseAddr.add(0x36BA7DC)); this.context.x8 = uploadCallback; console.log("[+] GetCallbackFromWrapper x8: " + this.context.x8); } }) - Interceptor.attach(baseAddr.add(0x4906EC8), { + Interceptor.attach(baseAddr.add(0x4913A88), { onEnter: function (args) { const tmpFileId = this.context.x1.readPointer().readUtf8String(); const fileId = imageIdAddr.readUtf8String(); @@ -698,7 +698,7 @@ function attachGetCallbackFromWrapper() { } console.log("[+] OnComplete x8: " + this.context.x8); - uploadCallback.add(0x30).writePointer(baseAddr.add(0x36B0DD0)); + uploadCallback.add(0x30).writePointer(baseAddr.add(0x36BB9C0)); this.context.x8 = uploadCallback; } }) diff --git a/frida/receiver.js b/frida/receiver.js index a61d420..6782298 100644 --- a/frida/receiver.js +++ b/frida/receiver.js @@ -3,8 +3,8 @@ if (!baseAddr) { console.error("[!] 找不到 WeChat 模块基址，请检查进程名。"); } -var buf2RespAddr = baseAddr.add(0x37173B0) -var downloadImagAddr = baseAddr.add(0x49FB92C) +var buf2RespAddr = baseAddr.add(0x3721FA0) +var downloadImagAddr = baseAddr.add(0x4A084EC) // -------------------------接收消息分区------------------------- function setReceiver() { diff --git a/frida/text.js b/frida/text.js index 0481a3e..2360408 100644 --- a/frida/text.js +++ b/frida/text.js @@ -78,23 +78,23 @@ function patchString(addr, plainStr) { // -------------------------全局变量分区------------------------- // 文本消息全局变量 -var protobufAddr = baseAddr.add(0x245E9B0); -var patchTextProtobufAddr = baseAddr.add(0x245E98C); -var PatchTextProtobufDeleteAddr = baseAddr.add(0x245E9C8); +var protobufAddr = baseAddr.add(0x24665A0); +var patchTextProtobufAddr = baseAddr.add(0x246657C); +var PatchTextProtobufDeleteAddr = baseAddr.add(0x24665B8); var textCgiAddr = ptr(0); var sendTextMessageAddr = ptr(0); var textMessageAddr = ptr(0); var textProtoX1PayloadAddr = ptr(0); var sendMessageCallbackFunc = ptr(0); -var messageCallbackFunc1 = baseAddr.add(0x8781010); +var messageCallbackFunc1 = baseAddr.add(0x8791310); // 双方公共使用的地址 var triggerX1Payload; var triggerX0; -var req2bufEnterAddr = baseAddr.add(0x36F1614); -var req2bufExitAddr = baseAddr.add(0x36F27EC); -var sendFuncAddr = baseAddr.add(0x47F1888); +var req2bufEnterAddr = baseAddr.add(0x36FC204); +var req2bufExitAddr = baseAddr.add(0x36FD3DC); +var sendFuncAddr = baseAddr.add(0x47FE448); var insertMsgAddr = ptr(0); var sendMsgType = ""; diff --git a/onebot/go.mod b/onebot/go.mod index 9d2f0a6..e0f5f77 100644 --- a/onebot/go.mod +++ b/onebot/go.mod @@ -5,14 +5,18 @@ go 1.25.0 require ( github.com/frida/frida-go v1.0.0 github.com/gorilla/websocket v1.5.3 + github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d + github.com/rs/zerolog v1.34.0 github.com/wdvxdr1123/go-silk v0.0.0-20220304095002-f67345df09ea + gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) require ( github.com/google/uuid v1.6.0 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect - golang.org/x/sys v0.0.0-20201126233918-771906719818 // indirect + golang.org/x/sys v0.12.0 // indirect modernc.org/libc v1.8.1 // indirect modernc.org/mathutil v1.2.2 // indirect modernc.org/memory v1.0.4 // indirect diff --git a/onebot/go.sum b/onebot/go.sum index bf0c1db..2d5f176 100644 --- a/onebot/go.sum +++ b/onebot/go.sum @@ -1,26 +1,43 @@ +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/frida/frida-go v1.0.0 h1:Xlq1CB8QSAC6zbOFdjCX0oK8RjQGtdl2yATbUQKROwo= github.com/frida/frida-go v1.0.0/go.mod h1:O8Dg1YBGfQsBEL1a8x3GURw/JllJrcuvg78ga2OgdM4= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= +github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= +github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/wdvxdr1123/go-silk v0.0.0-20220304095002-f67345df09ea h1:sl1pYm1kHtIndckTY8YDt+QFt77vI0JnKHP0U8rZtKc= github.com/wdvxdr1123/go-silk v0.0.0-20220304095002-f67345df09ea/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c= golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= modernc.org/libc v1.8.1 h1:y9oPIhwcaFXxX7kMp6Qb2ZLKzr0mDkikWN3CV5GS63o= diff --git a/onebot/http.go b/onebot/http.go index 27e60cd..a716055 100644 --- a/onebot/http.go +++ b/onebot/http.go @@ -8,7 +8,6 @@ import ( "encoding/json" "fmt" "io" - "log" "net/http" "runtime/debug" "strings" @@ -18,18 +17,21 @@ import ( func sendHandler(w http.ResponseWriter, r *http.Request) { if r.Method != http.MethodPost { http.Error(w, "仅支持 POST", http.StatusMethodNotAllowed) + Error("仅支持 POST") return } req := new(SendRequest) if err := json.NewDecoder(r.Body).Decode(req); err != nil { http.Error(w, "无效的 JSON", http.StatusBadRequest) + Error("无效的 JSON") return } // 参数校验 if len(req.Message) == 0 || (req.UserID == "" && req.GroupID == "") { http.Error(w, "参数缺失", http.StatusBadRequest) + Error("参数缺失") return } @@ -74,24 +76,24 @@ func sendHandler(w http.ResponseWriter, r *http.Request) { func SendHttpReq(jsonData []byte) { defer func() { if r := recover(); r != nil { - log.Printf("panic: %v, %v\n", r, string(debug.Stack())) + Error("http panic", "err", r, "stack", string(debug.Stack())) } }() time.Sleep(time.Duration(config.SendInterval) * time.Millisecond) jsonReq, err := HandleMsg(jsonData) if err != nil { - log.Printf("JSON 序列化失败: %v\n", err) + Error("JSON 序列化失败", "err", err) return } if jsonReq == nil { return } - fmt.Printf("发送数据: %s\n", string(jsonReq)) + Info("发送数据", "msg", string(jsonReq)) req, err := http.NewRequest("POST", config.SendURL, bytes.NewBuffer(jsonReq)) if err != nil { - log.Printf("创建请求失败: %v\n", err) + Error("创建请求失败", "err", err) return } @@ -107,7 +109,7 @@ func SendHttpReq(jsonData []byte) { // 6. 执行请求 resp, err := client.Do(req) if err != nil { - log.Printf("请求执行失败: %v\n", err) + Error("请求执行失败", "err", err) return } defer resp.Body.Close() @@ -115,9 +117,9 @@ func SendHttpReq(jsonData []byte) { // 7. 读取返回结果 body, err := io.ReadAll(resp.Body) if err != nil { - log.Printf("读取响应失败: %v\n", err) + Error("读取响应失败", "err", err) return } - fmt.Printf("状态码: %d 返回内容: %s\n", resp.StatusCode, string(body)) + Info("返回内容", "status", resp.StatusCode, "body", string(body)) } diff --git a/onebot/logger.go b/onebot/logger.go new file mode 100644 index 0000000..f10835b --- /dev/null +++ b/onebot/logger.go @@ -0,0 +1,151 @@ +package main + +import ( + "context" + "fmt" + "log" + "os" + "runtime" + "strings" + + "github.com/mgutz/ansi" + "github.com/rs/zerolog" + "gopkg.in/natefinch/lumberjack.v2" +) + +type LoggerInfo struct { + logger zerolog.Logger +} + +type QQLoggerInfo struct { + logger zerolog.Logger +} + +var ( + logLevel string +) + +// Logger instance +var Logger = new(LoggerInfo) +var QQLogger = new(QQLoggerInfo) + +// initLogger init logger +func initLogger() { + fileWriter := &lumberjack.Logger{ + Filename: "./log/macos.log", + MaxSize: 100, + MaxBackups: 10, + MaxAge: 30, + Compress: false, + } + + stdoutWriter := zerolog.ConsoleWriter{ + Out: os.Stdout, + TimeFormat: "2006-01-02 15:04:05", + FormatLevel: Logger.ColorFormatLevel, + } + + Logger.logger = zerolog.New(zerolog.MultiLevelWriter(fileWriter, stdoutWriter)).With(). + Timestamp(). + Logger() + QQLogger.logger = Logger.logger + + log.SetOutput(Logger.logger) + log.SetFlags(0) + // set log level + switch strings.ToLower(logLevel) { + case "debug": + zerolog.SetGlobalLevel(zerolog.DebugLevel) + case "info": + zerolog.SetGlobalLevel(zerolog.InfoLevel) + case "warn": + zerolog.SetGlobalLevel(zerolog.WarnLevel) + case "error": + zerolog.SetGlobalLevel(zerolog.ErrorLevel) + default: + zerolog.SetGlobalLevel(zerolog.InfoLevel) + } +} + +func getCallerFile() string { + _, filename, line, _ := runtime.Caller(2) + return fmt.Sprintf("%s:%d", filename, line) +} + +func DebugCtx(ctx context.Context, msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Debug().Fields(fields).Msg(callerFile + " " + msg) +} + +// InfoCtx info log +func InfoCtx(ctx context.Context, msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Info().Fields(fields).Msg(callerFile + " " + msg) +} + +// WarnCtx log +func WarnCtx(ctx context.Context, msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Warn().Fields(fields).Msg(callerFile + " " + msg) +} + +// ErrorCtx error log +func ErrorCtx(ctx context.Context, msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Error().Fields(fields).Msg(callerFile + " " + msg) +} + +// FatalCtx fatal log +func FatalCtx(ctx context.Context, msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Fatal().Fields(fields).Msg(callerFile + " " + msg) +} + +func Debug(msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Debug().Fields(fields).Msg(callerFile + " " + msg) +} + +// Info info log +func Info(msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Info().Fields(fields).Msg(callerFile + " " + msg) +} + +// Warn log +func Warn(msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Warn().Fields(fields).Msg(callerFile + " " + msg) +} + +// Error error log +func Error(msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Error().Fields(fields).Msg(callerFile + " " + msg) +} + +// Fatal fatal log +func Fatal(msg string, fields ...interface{}) { + callerFile := getCallerFile() + Logger.logger.Fatal().Fields(fields).Msg(callerFile + " " + msg) +} + +func (l *LoggerInfo) ColorFormatLevel(i interface{}) string { + level := strings.ToUpper(fmt.Sprintf("%v", i)) + switch level { + case "DEBUG": + return ansi.Color(fmt.Sprintf("| %-5s |", level), "cyan") + case "INFO": + return ansi.Color(fmt.Sprintf("| %-5s |", level), "green") + case "WARN": + return ansi.Color(fmt.Sprintf("| %-5s |", level), "yellow") + case "ERROR": + return ansi.Color(fmt.Sprintf("| %-5s |", level), "red") + case "FATAL": + return ansi.Color(fmt.Sprintf("| %-5s |", level), "magenta") + case "PANIC": + return ansi.Color(fmt.Sprintf("| %-5s |", level), "magenta+bh") + default: + return ansi.Color(fmt.Sprintf("| %-5s |", "STD"), "white") + } +} diff --git a/onebot/main.go b/onebot/main.go index 452fce2..693da88 100644 --- a/onebot/main.go +++ b/onebot/main.go @@ -5,7 +5,6 @@ import ( "encoding/json" "flag" "fmt" - "log" "net/http" "os" "os/signal" @@ -19,6 +18,7 @@ import ( func main() { initFlag() + initLogger() if config.FridaType == "gadget" { initFridaGadget() } else { @@ -37,13 +37,13 @@ func main() { go func() { <-stop - log.Fatalf("\n正在释放 Frida 资源并退出...") + Fatal("正在释放 Frida 资源并退出...") }() // 3. 启动服务 - fmt.Printf("HTTP 服务启动在 %s\n", config.ReceiveHost) + Info("HTTP 服务启动在", "host", config.ReceiveHost) if err := http.ListenAndServe(config.ReceiveHost, nil); err != nil { - log.Printf("服务启动失败: %v\n", err) + Error("服务启动失败", "err", err) } } @@ -59,6 +59,7 @@ func initFlag() { flag.StringVar(&config.WechatConf, "wechat_conf", "../wechat_version/4_1_7_55_mac.json", "微信配置文件路径: ../wechat_version/4_1_6_12_mac.json") flag.StringVar(&config.ConnType, "conn_type", "http", "连接类型: http | websocket") flag.IntVar(&config.SendInterval, "send_interval", 1000, "发送间隔: ms") + flag.StringVar(&logLevel, "log_level", "info", "log level") flag.Parse() @@ -70,14 +71,17 @@ func initFlag() { fmt.Println("OnebotToken", config.OnebotToken) fmt.Println("ImagePath", config.ImagePath) fmt.Println("WechatConf", config.WechatConf) + fmt.Println("ConnType", config.ConnType) + fmt.Println("SendInterval", config.SendInterval) + fmt.Println("logLevel", logLevel) err := EnsureDir("./audio") if err != nil { - log.Fatalf("❌ 无法创建音频目录: %v\n", err) + Fatal("❌ 无法创建音频目录", err) } err = EnsureDir("./image") if err != nil { - log.Fatalf("❌ 无法创建图片目录: %v\n", err) + Fatal("❌ 无法创建图片目录", err) } } @@ -86,12 +90,12 @@ func initFridaGadget() { // 连接到 Gadget 默认端口 device, err := mgr.AddRemoteDevice(config.FridaGadgetAddr, frida.NewRemoteDeviceOptions()) if err != nil { - log.Fatalf("❌ 无法连接 Gadget: %v\n", err) + Fatal("❌ 无法连接 Gadget", err) } session, err = device.Attach("Gadget", nil) if err != nil { - log.Fatalf("❌ 附加失败: %v\n", err) + Fatal("❌ 附加失败", err) } loadJs() @@ -105,13 +109,12 @@ func initFrida() { // 2. 枚举并获取本地设备 (TypeLocal) device, err := mgr.DeviceByType(frida.DeviceTypeLocal) if err != nil { - log.Fatalf("无法获取本地设备: %v", err) + Fatal("无法获取本地设备", "err", err) } - fmt.Printf("正在尝试 Attach 到微信...") session, err = device.Attach(config.WechatPid, nil) if err != nil { - log.Fatalf("Attach 失败 (请检查 SIP 状态或权限): %v", err) + Fatal("Attach 失败 (请检查 SIP 状态或权限)", "err", err) } loadJs() @@ -120,49 +123,49 @@ func initFrida() { func loadJs() { jsonData, err := os.ReadFile(config.WechatConf) if err != nil { - log.Fatalf("读取文件失败: %v\n", err) + Fatal("读取文件失败", "err", err) } // 2. 将 JSON 解析为 Map var wechatHookConf map[string]interface{} - if err := json.Unmarshal(jsonData, &wechatHookConf); err != nil { - log.Fatalf("解析 JSON 失败: %v\n", err) + if err = json.Unmarshal(jsonData, &wechatHookConf); err != nil { + Fatal("解析 JSON 失败", "err", err) } codeTemplate, err := os.ReadFile("./script.js") if err != nil { - log.Fatalf("读取脚本失败: %v\n", err) + Fatal("读取脚本失败", "err", err) } tmpl, err := template.New("fridaScript").Parse(string(codeTemplate)) if err != nil { - fmt.Printf("解析模板失败: %v\n", err) + Fatal("解析模板失败", "err", err) return } var buf bytes.Buffer err = tmpl.Execute(&buf, wechatHookConf) if err != nil { - log.Fatalf("执行模板失败: %v\n", err) + Fatal("执行模板失败", "err", err) } script, err := session.CreateScript(buf.String()) if err != nil { - log.Fatalf("❌ 创建脚本失败: %v\n", err) + Fatal("创建脚本失败", "err", err) } // 打印 JS 里的 console.log script.On("message", func(rawMsg string) { defer func() { if r := recover(); r != nil { - log.Printf("panic: %v, %v\n", r, string(debug.Stack())) + Error("message panic", "err", r, "stack", string(debug.Stack())) } }() var msg map[string]interface{} err = json.Unmarshal([]byte(rawMsg), &msg) if err != nil { - log.Printf("JSON解析失败: %v\n", err) + Error("JSON解析失败", "err", err) return } @@ -185,7 +188,6 @@ func loadJs() { finishChan <- struct{}{} case "upload": if selfId, ok := pMap["self_id"]; ok && myWechatId == "" { - fmt.Printf("✅ 检测到微信登录，当前账号: %s\n", selfId.(string)) myWechatId = selfId.(string) } case "upload_finish": @@ -204,7 +206,7 @@ func loadJs() { case "download": err = Download(payloadJson) if err != nil { - log.Printf("下载失败: %v\n", err) + Error("下载失败", "err", err) } } @@ -213,17 +215,17 @@ func loadJs() { } case "log": // 这里处理 console.log - log.Printf("[JS日志] %s\n", msg["payload"]) + Info("[JS日志]", "payload", msg["payload"]) case "error": // 这里处理 JS 脚本报错 - log.Printf("[❌脚本报错] %s\n", msg["description"]) + Error("[JS日志报错]", "err", msg["description"]) } }) if err := script.Load(); err != nil { - log.Fatalf("❌ 加载脚本失败: %v\n", err) + Fatal("❌ 加载脚本失败", err) } fridaScript = script - fmt.Printf("✅ Frida 已就绪，微信控制通道已打通") + Info("✅ Frida 已就绪，微信控制通道已打通") } diff --git a/onebot/msg.go b/onebot/msg.go index ed08ae9..98888f2 100644 --- a/onebot/msg.go +++ b/onebot/msg.go @@ -2,19 +2,17 @@ package main import ( "encoding/json" - "fmt" - "log" ) func Download(rawMsg []byte) error { downloadReq := new(DownloadRequest) err := json.Unmarshal(rawMsg, downloadReq) if err != nil { - log.Printf("JSON解析失败: %v\n", err) + Error("JSON解析失败", "err", err) return err } - fmt.Printf("下载文件: %s, %d, %s\n", downloadReq.FileID, len(downloadReq.Media), downloadReq.CDNURL[:10]) + Info("下载文件", "file_id", downloadReq.FileID, "media_len", len(downloadReq.Media), "cdn_url", downloadReq.CDNURL[:10]) if downloadReqInter, ok := userID2FileMsgMap.Load(downloadReq.CDNURL); ok { downloadReq = downloadReqInter.(*DownloadRequest) downloadReq.Media = append(downloadReq.Media, downloadReq.Media...) diff --git a/onebot/script.js b/onebot/script.js index 57e192d..ed5abdd 100644 --- a/onebot/script.js +++ b/onebot/script.js @@ -556,12 +556,12 @@ function attachSendTextProto() { this.context.x1 = textProtoX1PayloadAddr; this.context.x2 = ptr(finalPayload.length); - console.log("[+] 寄存器修改完成: X1=" + this.context.x1 + ", X2=" + this.context.x2, hexdump(textProtoX1PayloadAddr, { - offset: 0, - length: 128, - header: true, - ansi: true - })); + // console.log("[+] 寄存器修改完成: X1=" + this.context.x1 + ", X2=" + this.context.x2, hexdump(textProtoX1PayloadAddr, { + // offset: 0, + // length: 128, + // header: true, + // ansi: true + // })); }, }); } diff --git a/onebot/utils.go b/onebot/utils.go index 59e9132..21ec1b5 100644 --- a/onebot/utils.go +++ b/onebot/utils.go @@ -10,7 +10,6 @@ import ( "encoding/xml" "fmt" "io" - log "log" "math/rand" "os" "os/exec" @@ -161,7 +160,7 @@ func HandleMsg(jsonData []byte) ([]byte, error) { m := new(WechatMessage) err := json.Unmarshal(jsonData, m) if err != nil { - log.Printf("解析消息失败: %v\n", err) + Error("解析消息失败", "err", err) return nil, err } myWechatId = m.SelfID @@ -173,16 +172,16 @@ func HandleMsg(jsonData []byte) ([]byte, error) { if msg.Type == "record" { path, err := SaveAudioFile(msg.Data.Media) if err != nil { - log.Printf("保存音频失败: %v\n", err) + Error("保存音频失败", "err", err) return nil, err } msg.Data.URL = "file://" + path msg.Data.Media = nil } else if msg.Type == "image" { var fileMsg FileMsg - err := xml.Unmarshal([]byte(msg.Data.Text), &fileMsg) + err = xml.Unmarshal([]byte(msg.Data.Text), &fileMsg) if err != nil { - log.Printf("XML解析失败: %v\n", err) + Error("XML解析失败", "err", err) return nil, err } @@ -193,7 +192,7 @@ func HandleMsg(jsonData []byte) ([]byte, error) { aesKey, _ := hex.DecodeString(fileMsg.Image.ThumbAesKey) path, err := GetImagePath(downloadReq.Media, aesKey) if err != nil { - log.Printf("获取图片路径失败: %v\n", err) + Error("获取图片路径失败", "err", err) return nil, err } msg.Data.URL = "file://" + path diff --git a/onebot/websocket.go b/onebot/websocket.go index 785c06c..4860ea1 100644 --- a/onebot/websocket.go +++ b/onebot/websocket.go @@ -4,7 +4,6 @@ import ( "encoding/json" "fmt" "io" - "log" "net/http" "runtime/debug" "strings" @@ -32,25 +31,23 @@ func handleWebSocket(w http.ResponseWriter, r *http.Request) { var err error conn, err = upgrader.Upgrade(w, r, nil) if err != nil { - log.Println("升级失败:", err) + Error("升级失败", "err", err) return } defer conn.Close() - fmt.Println("机器人已连接！") - for { m := new(OneBotWSMsg) _, msgByte, err := conn.ReadMessage() if err != nil { - log.Println("读取失败:", err) + Error("读取失败", "err", err) break } - fmt.Println("收到消息: " + string(msgByte)) + Info("收到消息", "msg", string(msgByte)) err = json.Unmarshal(msgByte, m) if err != nil { - log.Println("解析失败:", err) + Error("解析失败", "err", err) continue } @@ -65,13 +62,13 @@ func handleWebSocket(w http.ResponseWriter, r *http.Request) { }, }) if err != nil { - log.Println("写入失败:", err) + Error("写入失败", "err", err) break } case "send_private_msg", "send_group_msg": err = SendWS(m.Params) if err != nil { - log.Println("发送失败:", err) + Error("发送失败", "err", err) break } @@ -84,25 +81,30 @@ func handleWebSocket(w http.ResponseWriter, r *http.Request) { func SendWebSocketMsg(jsonData []byte) { defer func() { if r := recover(); r != nil { - log.Printf("panic: %v, %v\n", r, string(debug.Stack())) + Error("ws panic", "err", r, "stack", string(debug.Stack())) } }() + if conn == nil { + Error("连接为空") + return + } + time.Sleep(time.Duration(config.SendInterval) * time.Millisecond) jsonReq, err := HandleMsg(jsonData) if err != nil { - log.Printf("JSON 序列化失败: %v\n", err) + Error("JSON 序列化失败", "err", err) return } if jsonReq == nil { return } - fmt.Printf("发送数据: %s\n", string(jsonReq)) + Info("发送数据", "msg", string(jsonReq)) err = conn.WriteMessage(websocket.TextMessage, jsonReq) if err != nil { - log.Printf("发送消息失败: %v\n", err) + Error("发送消息失败", "err", err) return } } @@ -115,13 +117,13 @@ func SendWS(req *WSParams) error { } else { bytes, err := json.Marshal(req.Message) if err != nil { - log.Printf("JSON 序列化失败: %v\n", err) + Error("JSON 序列化失败", "err", err) return err } msgs := make([]*Message, 0) err = json.Unmarshal(bytes, &msgs) if err != nil { - log.Printf("JSON 反序列化失败: %v\n", err) + Error("JSON 反序列化失败", "err", err) return err } @@ -164,13 +166,13 @@ func SendWS(req *WSParams) error { func testWebSocket(w http.ResponseWriter, r *http.Request) { jsonData, err := io.ReadAll(r.Body) if err != nil { - log.Printf("读取消息失败: %v\n", err) + Error("读取消息失败", "err", err) return } err = conn.WriteMessage(websocket.TextMessage, jsonData) if err != nil { - log.Printf("发送消息失败: %v\n", err) + Error("发送消息失败", "err", err) return } } diff --git a/onebot/worker.go b/onebot/worker.go index 69c6e81..040f208 100644 --- a/onebot/worker.go +++ b/onebot/worker.go @@ -2,8 +2,7 @@ package main import ( "context" - "fmt" - "log" + "runtime/debug" "sync/atomic" "time" ) @@ -11,7 +10,7 @@ import ( func SendWorker() { defer func() { if err := recover(); err != nil { - log.Printf("💥 SendWorker 异常: %v\n", err) + Error("SendWorker panic", "err", err, "stack", string(debug.Stack())) go SendWorker() } }() @@ -19,7 +18,7 @@ func SendWorker() { for { select { case <-finishChan: - fmt.Printf("收到完成信号 \n") + Info("收到完成信号") case m, ok := <-msgChan: if !ok { return @@ -32,7 +31,7 @@ func SendWorker() { func SendWechatMsg(m *SendMsg) { time.Sleep(time.Duration(config.SendInterval) * time.Millisecond) currTaskId := atomic.AddInt64(&taskId, 1) - log.Printf("📩 收到任务: %d\n", currTaskId) + Info("📩 收到任务", "task_id", currTaskId) ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) defer cancel() @@ -45,26 +44,25 @@ func SendWechatMsg(m *SendMsg) { switch m.Type { case "text": result := fridaScript.ExportsCall("triggerSendTextMessage", currTaskId, targetId, m.Content, m.AtUser) - log.Printf("📩 发送文本任务执行结果：%s, 参数：currTaskId: %d, targetId: %s, content: %s, atUser: %s\n", - result, currTaskId, targetId, m.Content, m.AtUser) + Info("📩 发送文本任务执行结果", "result", result, "task_id", currTaskId, "target_id", targetId, "content", m.Content, "at_user", m.AtUser) case "image": targetPath, md5Str, err := SaveBase64Image(m.Content) if err != nil { - log.Printf("保存图片失败: %v\n", err) + Error("保存图片失败", "err", err) return } result := fridaScript.ExportsCall("triggerUploadImg", targetId, md5Str, targetPath) - log.Printf("📩 上传图片任务执行结果%s, 参数：targetId: %s, md5Str: %s, targetPath: %s\n", result, targetId, md5Str, targetPath) + Info("📩 上传图片任务执行结果n", "result", result, "target_id", targetId, "md5", md5Str, "path", targetPath) case "send_image": result := fridaScript.ExportsCall("triggerSendImgMessage", currTaskId, myWechatId, targetId) - log.Printf("📩 发送图片任务执行结果%s, 参数：currTaskId: %d, myWechatId: %s, targetId: %s\n", result, currTaskId, myWechatId, targetId) + Info("📩 发送图片任务执行结果", "result", result, "task_id", currTaskId, "wechat_id", myWechatId, "target_id", targetId) } select { case <-ctx.Done(): - log.Printf("任务 %d 执行超时！\n", currTaskId) + Info("任务执行超时！", "taskId", currTaskId) case <-finishChan: - log.Printf("收到完成信号，任务 %d 完成\n", currTaskId) + Info("收到完成信号，任务完成", "taskId", currTaskId) } } diff --git a/todo_list b/todo_list new file mode 100644 index 0000000..7027bb2 --- /dev/null +++ b/todo_list @@ -0,0 +1,3 @@ +1. 手动发消息为什么会导致crash +2. 判断receiver头部 +3. 图片找出高清晰度的下载方法 diff --git a/wechat_version/4_1_7_57_mac.json b/wechat_version/4_1_7_57_mac.json new file mode 100644 index 0000000..6113ff6 --- /dev/null +++ b/wechat_version/4_1_7_57_mac.json @@ -0,0 +1,22 @@ +{ + "protobufAddr": "0x245E9B0", + "patchTextProtobufAddr": "0x245E98C", + "PatchTextProtobufDeleteAddr": "0x245E9C8", + "sendMessageCallbackFunc": "0x8781010", + "sendFuncAddr": "0x47F1888", + "req2bufEnterAddr": "0x36F1614", + "req2bufExitAddr": "0x36F27EC", + "imgProtobufAddr": "0x2455574", + "patchImgProtobufFunc1": "0x2455530", + "patchImgProtobufFunc2": "0x2455550", + "imgProtobufDeleteAddr": "0x245558C", + "imgMessageCallbackFunc1": "0x8780AD8", + "uploadImageAddr": "0x4938E08", + "CndOnCompleteAddr": "0x36B03A0", + "buf2RespAddr": "0x37173B0", + "uploadGetCallbackWrapperAddr": "0x49068CC", + "uploadGetCallbackWrapperFuncAddr": "0x36AFBEC", + "uploadOnCompleteAddr": "0x4906EC8", + "uploadOnCompleteFuncAddr": "0x36B0DD0", + "downloadImagAddr": "0x49FB92C" +}