From 0455e2102de38636daa816f0ce269f62c0d91692 Mon Sep 17 00:00:00 2001 From: Chris Gioran Date: Mon, 25 Sep 2017 19:33:08 +0200 Subject: [PATCH] Extract encryption specific code away from the causal clustering code Encryption is functionality that is not fundamental to the guarantees causal clustering provides. As such, it doesn't belong in this project. Methods to provide encrypted cluster communication will be available through separate offerings. --- enterprise/causal-clustering/LICENSE.txt | 681 ++++++++++++++++++ .../catchup/CatchUpClient.java | 18 +- .../catchup/CatchUpClientChannelPipeline.java | 9 +- .../catchup/CatchupServer.java | 33 +- .../core/CoreGraphDatabase.java | 4 + .../core/EnterpriseCoreEditionModule.java | 36 +- .../core/consensus/RaftServer.java | 21 +- .../core/server/CoreServerModule.java | 17 +- .../core/state/ClusteringModule.java | 5 +- .../discovery/DiscoveryServiceFactory.java | 7 +- .../discovery/HazelcastClientConnector.java | 15 +- .../HazelcastCoreTopologyService.java | 27 +- .../HazelcastDiscoveryServiceFactory.java | 11 +- .../handlers/NoOpPipelineHandlerAppender.java | 30 + .../NoOpPipelineHandlerAppenderFactory.java | 32 + .../handlers/PipelineHandlerAppender.java | 36 + .../PipelineHandlerAppenderFactory.java | 29 + .../messaging/RaftChannelInitializer.java | 13 +- .../EnterpriseReadReplicaEditionModule.java | 29 +- .../readreplica/ReadReplicaGraphDatabase.java | 4 + .../causalclustering/discovery/Cluster.java | 10 +- .../discovery/CoreClusterMember.java | 9 +- .../discovery/ReadReplica.java | 10 +- .../discovery/SharedDiscoveryService.java | 5 +- .../discovery/SharedDiscoveryServiceIT.java | 8 +- .../scenarios/SecureClusterIT.java | 129 ---- 26 files changed, 966 insertions(+), 262 deletions(-) create mode 100644 enterprise/causal-clustering/LICENSE.txt create mode 100644 enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/NoOpPipelineHandlerAppender.java create mode 100644 enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/NoOpPipelineHandlerAppenderFactory.java create mode 100644 enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/PipelineHandlerAppender.java create mode 100644 enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/PipelineHandlerAppenderFactory.java delete mode 100644 enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/SecureClusterIT.java diff --git a/enterprise/causal-clustering/LICENSE.txt b/enterprise/causal-clustering/LICENSE.txt new file mode 100644 index 0000000000000..f6518b69f8407 --- /dev/null +++ b/enterprise/causal-clustering/LICENSE.txt @@ -0,0 +1,681 @@ +NOTICE +This package contains software licensed under different +licenses, please refer to the NOTICE.txt file for further +information and LICENSES.txt for full license texts. + +The software ("Software") is developed and owned by Network Engine +for Objects in Lund AB (referred to in this notice as "Neo Technology"). +If you have executed an End User Software License and Services Agreement, +an OEM Software License and Support Services Agreement, or another +commercial license agreement (including an Evaluation Agreement) with +Neo Technology or one of its affiliates (each, a "Commercial Agreement"), +you may use the Software solely pursuant to the terms of the relevant +Commercial Agreement. + +If you have not executed a Commercial Agreement with Neo Technology, the +Software is subject to the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +Version 3, as follows: + + + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 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. + + + Copyright (C) + + 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 . + +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 +. diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpClient.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpClient.java index f98b6eb8d8d72..c6aaa3c1cbcd1 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpClient.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpClient.java @@ -19,6 +19,10 @@ */ package org.neo4j.causalclustering.catchup; +import java.time.Clock; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; + import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; @@ -27,10 +31,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; -import java.time.Clock; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; - +import org.neo4j.causalclustering.handlers.PipelineHandlerAppender; import org.neo4j.causalclustering.messaging.CatchUpRequest; import org.neo4j.helpers.AdvertisedSocketAddress; import org.neo4j.helpers.NamedThreadFactory; @@ -38,7 +39,6 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.MICROSECONDS; @@ -50,21 +50,21 @@ public class CatchUpClient extends LifecycleAdapter private final Log log; private final Clock clock; private final Monitors monitors; - private final SslPolicy sslPolicy; + private final PipelineHandlerAppender pipelineAppender; private final long inactivityTimeoutMillis; private final CatchUpChannelPool pool = new CatchUpChannelPool<>( CatchUpChannel::new ); private NioEventLoopGroup eventLoopGroup; public CatchUpClient( LogProvider logProvider, Clock clock, long inactivityTimeoutMillis, Monitors monitors, - SslPolicy sslPolicy ) + PipelineHandlerAppender pipelineAppender ) { this.logProvider = logProvider; this.log = logProvider.getLog( getClass() ); this.clock = clock; this.inactivityTimeoutMillis = inactivityTimeoutMillis; this.monitors = monitors; - this.sslPolicy = sslPolicy; + this.pipelineAppender = pipelineAppender; } public T makeBlockingRequest( AdvertisedSocketAddress upstream, CatchUpRequest request, CatchUpResponseCallback responseHandler ) @@ -110,7 +110,7 @@ private class CatchUpChannel implements CatchUpChannelPool.Channel @Override protected void initChannel( SocketChannel ch ) throws Exception { - CatchUpClientChannelPipeline.initChannel( ch, handler, logProvider, monitors, sslPolicy ); + CatchUpClientChannelPipeline.initChannel( ch, handler, logProvider, monitors, pipelineAppender ); } } ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpClientChannelPipeline.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpClientChannelPipeline.java index fe4b49353178e..58d18cc72a770 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpClientChannelPipeline.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchUpClientChannelPipeline.java @@ -47,9 +47,9 @@ import org.neo4j.causalclustering.handlers.ExceptionLoggingHandler; import org.neo4j.causalclustering.handlers.ExceptionMonitoringHandler; import org.neo4j.causalclustering.handlers.ExceptionSwallowingHandler; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppender; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; class CatchUpClientChannelPipeline { @@ -58,16 +58,13 @@ private CatchUpClientChannelPipeline() } static void initChannel( SocketChannel ch, CatchUpResponseHandler handler, LogProvider logProvider, - Monitors monitors, SslPolicy sslPolicy ) throws Exception + Monitors monitors, PipelineHandlerAppender pipelineHandlerAppender ) throws Exception { CatchupClientProtocol protocol = new CatchupClientProtocol(); ChannelPipeline pipeline = ch.pipeline(); - if ( sslPolicy != null ) - { - pipeline.addLast( sslPolicy.nettyClientHandler( ch ) ); - } + pipelineHandlerAppender.addPipelineHandlerForClient( pipeline, ch ); pipeline.addLast( new LengthFieldBasedFrameDecoder( Integer.MAX_VALUE, 0, 4, 0, 4 ) ); pipeline.addLast( new LengthFieldPrepender( 4 ) ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchupServer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchupServer.java index fc3f284a7f554..4f9a7153760de 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchupServer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/CatchupServer.java @@ -19,6 +19,11 @@ */ package org.neo4j.causalclustering.catchup; +import java.net.BindException; +import java.util.concurrent.TimeUnit; +import java.util.function.BooleanSupplier; +import java.util.function.Supplier; + import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelInboundHandler; @@ -33,11 +38,6 @@ import io.netty.handler.codec.LengthFieldPrepender; import io.netty.handler.stream.ChunkedWriteHandler; -import java.net.BindException; -import java.util.concurrent.TimeUnit; -import java.util.function.BooleanSupplier; -import java.util.function.Supplier; - import org.neo4j.causalclustering.VersionDecoder; import org.neo4j.causalclustering.VersionPrepender; import org.neo4j.causalclustering.catchup.CatchupServerProtocol.State; @@ -61,6 +61,7 @@ import org.neo4j.causalclustering.handlers.ExceptionLoggingHandler; import org.neo4j.causalclustering.handlers.ExceptionMonitoringHandler; import org.neo4j.causalclustering.handlers.ExceptionSwallowingHandler; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppender; import org.neo4j.causalclustering.identity.StoreId; import org.neo4j.helpers.ListenSocketAddress; import org.neo4j.helpers.NamedThreadFactory; @@ -76,7 +77,6 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; public class CatchupServer extends LifecycleAdapter { @@ -92,7 +92,7 @@ public class CatchupServer extends LifecycleAdapter private final BooleanSupplier dataSourceAvailabilitySupplier; private final FileSystemAbstraction fs; private final PageCache pageCache; - private final SslPolicy sslPolicy; + private final PipelineHandlerAppender pipelineAppender; private final StoreCopyCheckPointMutex storeCopyCheckPointMutex; private final NamedThreadFactory threadFactory = new NamedThreadFactory( "catchup-server" ); @@ -104,12 +104,12 @@ public class CatchupServer extends LifecycleAdapter private final Supplier checkPointerSupplier; public CatchupServer( LogProvider logProvider, LogProvider userLogProvider, Supplier storeIdSupplier, - Supplier transactionIdStoreSupplier, - Supplier logicalTransactionStoreSupplier, - Supplier dataSourceSupplier, BooleanSupplier dataSourceAvailabilitySupplier, - CoreSnapshotService snapshotService, Config config, Monitors monitors, Supplier checkPointerSupplier, - FileSystemAbstraction fs, PageCache pageCache, - StoreCopyCheckPointMutex storeCopyCheckPointMutex, SslPolicy sslPolicy ) + Supplier transactionIdStoreSupplier, + Supplier logicalTransactionStoreSupplier, + Supplier dataSourceSupplier, BooleanSupplier dataSourceAvailabilitySupplier, + CoreSnapshotService snapshotService, Config config, Monitors monitors, Supplier checkPointerSupplier, + FileSystemAbstraction fs, PageCache pageCache, + StoreCopyCheckPointMutex storeCopyCheckPointMutex, PipelineHandlerAppender pipelineAppender ) { this.snapshotService = snapshotService; this.storeCopyCheckPointMutex = storeCopyCheckPointMutex; @@ -126,7 +126,7 @@ public CatchupServer( LogProvider logProvider, LogProvider userLogProvider, Supp this.checkPointerSupplier = checkPointerSupplier; this.fs = fs; this.pageCache = pageCache; - this.sslPolicy = sslPolicy; + this.pipelineAppender = pipelineAppender; } @Override @@ -150,10 +150,7 @@ protected void initChannel( SocketChannel ch ) throws Exception ChannelPipeline pipeline = ch.pipeline(); - if ( sslPolicy != null ) - { - pipeline.addLast( sslPolicy.nettyServerHandler( ch ) ); - } + pipelineAppender.addPipelineHandlerForServer( pipeline, ch ); pipeline.addLast( new LengthFieldBasedFrameDecoder( Integer.MAX_VALUE, 0, 4, 0, 4 ) ); pipeline.addLast( new LengthFieldPrepender( 4 ) ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CoreGraphDatabase.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CoreGraphDatabase.java index b1e4473e0ba0e..20e62e0365bc2 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CoreGraphDatabase.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CoreGraphDatabase.java @@ -35,6 +35,10 @@ public class CoreGraphDatabase extends GraphDatabaseFacade { + protected CoreGraphDatabase() + { + } + public CoreGraphDatabase( File storeDir, Config config, GraphDatabaseFacadeFactory.Dependencies dependencies ) { diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java index d0904447db655..72cfdfa0345b8 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java @@ -44,6 +44,9 @@ import org.neo4j.causalclustering.discovery.DiscoveryServiceFactory; import org.neo4j.causalclustering.discovery.procedures.ClusterOverviewProcedure; import org.neo4j.causalclustering.discovery.procedures.CoreRoleProcedure; +import org.neo4j.causalclustering.handlers.NoOpPipelineHandlerAppenderFactory; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppender; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppenderFactory; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.load_balancing.LoadBalancingPluginLoader; import org.neo4j.causalclustering.load_balancing.LoadBalancingProcessor; @@ -70,7 +73,6 @@ import org.neo4j.kernel.api.bolt.BoltConnectionTracker; import org.neo4j.kernel.api.exceptions.KernelException; import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.configuration.ssl.SslPolicyLoader; import org.neo4j.kernel.enterprise.builtinprocs.EnterpriseBuiltInDbmsProcedures; import org.neo4j.kernel.impl.api.SchemaWriteGuard; import org.neo4j.kernel.impl.api.TransactionHeaderInformation; @@ -99,7 +101,6 @@ import org.neo4j.kernel.lifecycle.LifecycleStatus; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; import org.neo4j.udc.UsageData; import static org.neo4j.causalclustering.core.CausalClusteringSettings.raft_messages_log_path; @@ -113,8 +114,8 @@ public class EnterpriseCoreEditionModule extends EditionModule private final ConsensusModule consensusModule; private final ReplicationModule replicationModule; private final CoreTopologyService topologyService; - private final LogProvider logProvider; - private final Config config; + protected final LogProvider logProvider; + protected final Config config; private CoreStateMachinesModule coreStateMachinesModule; public enum RaftLogImplementation @@ -198,17 +199,18 @@ public void registerEditionSpecificProcedures( Procedures procedures ) throws Ke IdentityModule identityModule = new IdentityModule( platformModule, clusterStateDirectory.get() ); - SslPolicyLoader sslPolicyFactory = dependencies.satisfyDependency( SslPolicyLoader.create( config, logProvider ) ); - SslPolicy clusterSslPolicy = sslPolicyFactory.getPolicy( config.get( CausalClusteringSettings.ssl_policy ) ); + ClusteringModule clusteringModule = getClusteringModule( platformModule, discoveryServiceFactory, + clusterStateDirectory, identityModule, dependencies ); + + PipelineHandlerAppenderFactory appenderFactory = appenderFactory(); + PipelineHandlerAppender pipelineHandlerAppender = appenderFactory.create( config, dependencies, logProvider ); - ClusteringModule clusteringModule = new ClusteringModule( discoveryServiceFactory, identityModule.myself(), - platformModule, clusterStateDirectory.get(), clusterSslPolicy ); topologyService = clusteringModule.topologyService(); long logThresholdMillis = config.get( CausalClusteringSettings.unknown_address_logging_throttle ).toMillis(); final SenderService raftSender = new SenderService( - new RaftChannelInitializer( new CoreReplicatedContentMarshal(), logProvider, monitors, clusterSslPolicy ), + new RaftChannelInitializer( new CoreReplicatedContentMarshal(), logProvider, monitors, pipelineHandlerAppender ), logProvider, platformModule.monitors ); life.add( raftSender ); @@ -246,7 +248,7 @@ public void registerEditionSpecificProcedures( Procedures procedures ) throws Ke CoreServerModule coreServerModule = new CoreServerModule( identityModule, platformModule, consensusModule, coreStateMachinesModule, replicationModule, clusterStateDirectory.get(), clusteringModule, localDatabase, - messageLogger, databaseHealthSupplier, clusterSslPolicy ); + messageLogger, databaseHealthSupplier, pipelineHandlerAppender ); editionInvariants( platformModule, dependencies, config, logging, life ); @@ -256,6 +258,20 @@ public void registerEditionSpecificProcedures( Procedures procedures ) throws Ke life.add( coreServerModule.membershipWaiterLifecycle ); } + protected ClusteringModule getClusteringModule( PlatformModule platformModule, + DiscoveryServiceFactory discoveryServiceFactory, + ClusterStateDirectory clusterStateDirectory, + IdentityModule identityModule, Dependencies dependencies ) + { + return new ClusteringModule( discoveryServiceFactory, identityModule.myself(), + platformModule, clusterStateDirectory.get() ); + } + + protected PipelineHandlerAppenderFactory appenderFactory() + { + return new NoOpPipelineHandlerAppenderFactory(); + } + @Override protected void createIdComponents( PlatformModule platformModule, Dependencies dependencies, IdGeneratorFactory editionIdGeneratorFactory ) diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/RaftServer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/RaftServer.java index 126a710925dad..4ba180b313d49 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/RaftServer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/RaftServer.java @@ -19,6 +19,9 @@ */ package org.neo4j.causalclustering.core.consensus; +import java.net.BindException; +import java.util.concurrent.TimeUnit; + import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; @@ -33,9 +36,6 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder; import io.netty.handler.codec.LengthFieldPrepender; -import java.net.BindException; -import java.util.concurrent.TimeUnit; - import org.neo4j.causalclustering.VersionDecoder; import org.neo4j.causalclustering.VersionPrepender; import org.neo4j.causalclustering.core.CausalClusteringSettings; @@ -43,6 +43,7 @@ import org.neo4j.causalclustering.handlers.ExceptionLoggingHandler; import org.neo4j.causalclustering.handlers.ExceptionMonitoringHandler; import org.neo4j.causalclustering.handlers.ExceptionSwallowingHandler; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppender; import org.neo4j.causalclustering.messaging.Inbound; import org.neo4j.causalclustering.messaging.marshalling.ChannelMarshal; import org.neo4j.causalclustering.messaging.marshalling.RaftMessageDecoder; @@ -54,7 +55,6 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; import static java.lang.String.format; @@ -62,7 +62,7 @@ public class RaftServer extends LifecycleAdapter implements Inbound setting = CausalClusteringSettings.raft_listen_address; private final ChannelMarshal marshal; - private final SslPolicy sslPolicy; + private final PipelineHandlerAppender pipelineAppender; private final ListenSocketAddress listenAddress; private final LogProvider logProvider; private final Log log; @@ -75,11 +75,11 @@ public class RaftServer extends LifecycleAdapter implements Inbound marshal, SslPolicy sslPolicy, Config config, - LogProvider logProvider, LogProvider userLogProvider, Monitors monitors ) + public RaftServer( ChannelMarshal marshal, PipelineHandlerAppender pipelineAppender, Config config, + LogProvider logProvider, LogProvider userLogProvider, Monitors monitors ) { this.marshal = marshal; - this.sslPolicy = sslPolicy; + this.pipelineAppender = pipelineAppender; this.listenAddress = config.get( setting ); this.logProvider = logProvider; this.log = logProvider.getLog( getClass() ); @@ -131,10 +131,7 @@ protected void initChannel( SocketChannel ch ) throws Exception { ChannelPipeline pipeline = ch.pipeline(); - if ( sslPolicy != null ) - { - pipeline.addLast( sslPolicy.nettyServerHandler( ch ) ); - } + pipelineAppender.addPipelineHandlerForServer( pipeline, ch ); pipeline.addLast( new LengthFieldBasedFrameDecoder( Integer.MAX_VALUE, 0, 4, 0, 4 ) ); pipeline.addLast( new LengthFieldPrepender( 4 ) ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/server/CoreServerModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/server/CoreServerModule.java index 8a6b857051a77..eb362da24af01 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/server/CoreServerModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/server/CoreServerModule.java @@ -57,6 +57,7 @@ import org.neo4j.causalclustering.core.state.storage.DurableStateStorage; import org.neo4j.causalclustering.core.state.storage.StateStorage; import org.neo4j.causalclustering.discovery.TopologyService; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppender; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.logging.MessageLogger; import org.neo4j.causalclustering.messaging.CoreReplicatedContentMarshal; @@ -75,7 +76,6 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.LogProvider; import org.neo4j.scheduler.JobScheduler; -import org.neo4j.ssl.SslPolicy; import org.neo4j.time.Clocks; public class CoreServerModule @@ -85,9 +85,12 @@ public class CoreServerModule public final MembershipWaiterLifecycle membershipWaiterLifecycle; - public CoreServerModule( IdentityModule identityModule, final PlatformModule platformModule, ConsensusModule consensusModule, - CoreStateMachinesModule coreStateMachinesModule, ReplicationModule replicationModule, File clusterStateDirectory, ClusteringModule clusteringModule, - LocalDatabase localDatabase, MessageLogger messageLogger, Supplier dbHealthSupplier, SslPolicy sslPolicy ) + public CoreServerModule( IdentityModule identityModule, final PlatformModule platformModule, + ConsensusModule consensusModule, CoreStateMachinesModule coreStateMachinesModule, + ReplicationModule replicationModule, File clusterStateDirectory, + ClusteringModule clusteringModule, LocalDatabase localDatabase, + MessageLogger messageLogger, Supplier dbHealthSupplier, + PipelineHandlerAppender pipelineAppender ) { final Dependencies dependencies = platformModule.dependencies; final Config config = platformModule.config; @@ -109,14 +112,14 @@ public CoreServerModule( IdentityModule identityModule, final PlatformModule pla consensusModule.raftMembershipManager().setRecoverFromIndexSupplier( lastFlushedStorage::getInitialState ); - RaftServer raftServer = new RaftServer( new CoreReplicatedContentMarshal(), sslPolicy, config, logProvider, userLogProvider, monitors ); + RaftServer raftServer = new RaftServer( new CoreReplicatedContentMarshal(), pipelineAppender, config, logProvider, userLogProvider, monitors ); LoggingInbound loggingRaftInbound = new LoggingInbound<>( raftServer, messageLogger, identityModule.myself() ); long inactivityTimeoutMillis = config.get( CausalClusteringSettings.catch_up_client_inactivity_timeout ).toMillis(); CatchUpClient catchUpClient = life .add( new CatchUpClient( logProvider, Clocks.systemClock(), - inactivityTimeoutMillis, monitors, sslPolicy ) ); + inactivityTimeoutMillis, monitors, pipelineAppender ) ); RemoteStore remoteStore = new RemoteStore( logProvider, fileSystem, platformModule.pageCache, new StoreCopyClient( catchUpClient, logProvider ), @@ -199,7 +202,7 @@ private OnlineBackupKernelExtension pickBackupExtension( NeoStoreDataSource data platformModule.dependencies.provideDependency( TransactionIdStore.class ), platformModule.dependencies.provideDependency( LogicalTransactionStore.class ), localDatabase::dataSource, localDatabase::isAvailable, snapshotService, config, platformModule.monitors, new CheckpointerSupplier( platformModule.dependencies ), fileSystem, platformModule.pageCache, - platformModule.storeCopyCheckPointMutex, sslPolicy ); + platformModule.storeCopyCheckPointMutex, pipelineAppender ); // Exposes this so that tests can start/stop the catchup server dependencies.satisfyDependency( catchupServer ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/ClusteringModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/ClusteringModule.java index 65c8d4d95ed5f..e98c44ae34f60 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/ClusteringModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/ClusteringModule.java @@ -40,7 +40,6 @@ import org.neo4j.kernel.impl.util.Dependencies; import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; import org.neo4j.time.Clocks; import static java.lang.Thread.sleep; @@ -53,7 +52,7 @@ public class ClusteringModule private final ClusterBinder clusterBinder; public ClusteringModule( DiscoveryServiceFactory discoveryServiceFactory, MemberId myself, - PlatformModule platformModule, File clusterStateDirectory, SslPolicy sslPolicy ) + PlatformModule platformModule, File clusterStateDirectory ) { LifeSupport life = platformModule.life; Config config = platformModule.config; @@ -64,7 +63,7 @@ public ClusteringModule( DiscoveryServiceFactory discoveryServiceFactory, Member HostnameResolver hostnameResolver = chooseResolver( config, logProvider, userLogProvider ); topologyService = discoveryServiceFactory - .coreTopologyService( config, sslPolicy, myself, platformModule.jobScheduler, logProvider, + .coreTopologyService( config, myself, platformModule.jobScheduler, logProvider, userLogProvider, hostnameResolver, resolveStrategy( config ) ); life.add( topologyService ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactory.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactory.java index 19ac0736ea877..0119def119868 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactory.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactory.java @@ -21,17 +21,16 @@ import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.kernel.configuration.Config; -import org.neo4j.scheduler.JobScheduler; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; +import org.neo4j.scheduler.JobScheduler; public interface DiscoveryServiceFactory { - CoreTopologyService coreTopologyService( Config config, SslPolicy sslPolicy, MemberId myself, + CoreTopologyService coreTopologyService( Config config, MemberId myself, JobScheduler jobScheduler, LogProvider logProvider, LogProvider userLogProvider, HostnameResolver hostnameResolver, TopologyServiceRetryStrategy topologyServiceRetryStrategy ); - TopologyService topologyService( Config config, SslPolicy sslPolicy, LogProvider logProvider, + TopologyService topologyService( Config config, LogProvider logProvider, JobScheduler jobScheduler, MemberId myself, HostnameResolver hostnameResolver, TopologyServiceRetryStrategy topologyServiceRetryStrategy ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastClientConnector.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastClientConnector.java index 45abe78e80f9c..2e91d48525df7 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastClientConnector.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastClientConnector.java @@ -28,23 +28,17 @@ import org.neo4j.helpers.AdvertisedSocketAddress; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; - -import static org.neo4j.causalclustering.discovery.HazelcastSslConfiguration.configureSsl; public class HazelcastClientConnector implements HazelcastConnector { private final Config config; private final LogProvider logProvider; - private final SslPolicy sslPolicy; private final HostnameResolver hostnameResolver; - HazelcastClientConnector( Config config, LogProvider logProvider, SslPolicy sslPolicy, - HostnameResolver hostnameResolver ) + HazelcastClientConnector( Config config, LogProvider logProvider, HostnameResolver hostnameResolver ) { this.config = config; this.logProvider = logProvider; - this.sslPolicy = sslPolicy; this.hostnameResolver = hostnameResolver; } @@ -63,8 +57,13 @@ public HazelcastInstance connectToHazelcast() } } - configureSsl( networkConfig, sslPolicy, logProvider ); + additionalConfig( networkConfig, logProvider ); return HazelcastClient.newHazelcastClient( clientConfig ); } + + protected void additionalConfig( ClientNetworkConfig networkConfig, LogProvider logProvider ) + { + + } } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java index 2842ef35cfd00..c66c684167ccd 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java @@ -19,6 +19,12 @@ */ package org.neo4j.causalclustering.discovery; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + import com.hazelcast.config.InterfacesConfig; import com.hazelcast.config.JoinConfig; import com.hazelcast.config.MemberAttributeConfig; @@ -31,13 +37,6 @@ import com.hazelcast.core.MembershipEvent; import com.hazelcast.core.MembershipListener; -import java.time.Duration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.TimeUnit; - import org.neo4j.causalclustering.core.CausalClusteringSettings; import org.neo4j.causalclustering.helper.RobustJobSchedulerWrapper; import org.neo4j.causalclustering.identity.ClusterId; @@ -49,7 +48,6 @@ import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.scheduler.JobScheduler; -import org.neo4j.ssl.SslPolicy; import static com.hazelcast.spi.properties.GroupProperty.INITIAL_MIN_CLUSTER_SIZE; import static com.hazelcast.spi.properties.GroupProperty.LOGGING_TYPE; @@ -65,14 +63,11 @@ import static org.neo4j.causalclustering.discovery.HazelcastClusterTopology.getCoreTopology; import static org.neo4j.causalclustering.discovery.HazelcastClusterTopology.getReadReplicaTopology; import static org.neo4j.causalclustering.discovery.HazelcastClusterTopology.refreshGroups; -import static org.neo4j.causalclustering.discovery.HazelcastSslConfiguration.configureSsl; -import static org.neo4j.kernel.configuration.Settings.DURATION; class HazelcastCoreTopologyService extends LifecycleAdapter implements CoreTopologyService { private static final long HAZELCAST_IS_HEALTHY_TIMEOUT_MS = TimeUnit.MINUTES.toMillis( 10 ); private final Config config; - private final SslPolicy sslPolicy; private final MemberId myself; private final Log log; private final Log userLog; @@ -94,12 +89,11 @@ class HazelcastCoreTopologyService extends LifecycleAdapter implements CoreTopol private Thread startingThread; private volatile boolean stopped; - HazelcastCoreTopologyService( Config config, SslPolicy sslPolicy, MemberId myself, JobScheduler jobScheduler, + HazelcastCoreTopologyService( Config config, MemberId myself, JobScheduler jobScheduler, LogProvider logProvider, LogProvider userLogProvider, HostnameResolver hostnameResolver, TopologyServiceRetryStrategy topologyServiceRetryStrategy ) { this.config = config; - this.sslPolicy = sslPolicy; this.myself = myself; this.listenerService = new CoreTopologyListenerService(); this.log = logProvider.getLog( getClass() ); @@ -215,7 +209,7 @@ private HazelcastInstance createHazelcastInstance() networkConfig.setInterfaces( interfaces ); } - configureSsl( networkConfig, sslPolicy, logProvider ); + additionalConfig( networkConfig, logProvider ); networkConfig.setPort( hazelcastAddress.getPort() ); networkConfig.setJoin( joinConfig ); @@ -281,6 +275,11 @@ private HazelcastInstance createHazelcastInstance() return hazelcastInstance; } + protected void additionalConfig( NetworkConfig networkConfig, LogProvider logProvider ) + { + + } + private void logConnectionInfo( List initialMembers ) { userLog.info( "My connection info: " + "[\n\tDiscovery: listen=%s, advertised=%s," + diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastDiscoveryServiceFactory.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastDiscoveryServiceFactory.java index 9fd645459916c..b185c3706bf46 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastDiscoveryServiceFactory.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastDiscoveryServiceFactory.java @@ -24,29 +24,28 @@ import org.neo4j.causalclustering.core.CausalClusteringSettings; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.kernel.configuration.Config; -import org.neo4j.scheduler.JobScheduler; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; +import org.neo4j.scheduler.JobScheduler; public class HazelcastDiscoveryServiceFactory implements DiscoveryServiceFactory { @Override - public CoreTopologyService coreTopologyService( Config config, SslPolicy sslPolicy, MemberId myself, JobScheduler jobScheduler, + public CoreTopologyService coreTopologyService( Config config, MemberId myself, JobScheduler jobScheduler, LogProvider logProvider, LogProvider userLogProvider, HostnameResolver hostnameResolver, TopologyServiceRetryStrategy topologyServiceRetryStrategy ) { configureHazelcast( config ); - return new HazelcastCoreTopologyService( config, sslPolicy, myself, jobScheduler, logProvider, userLogProvider, hostnameResolver, + return new HazelcastCoreTopologyService( config, myself, jobScheduler, logProvider, userLogProvider, hostnameResolver, topologyServiceRetryStrategy ); } @Override - public TopologyService topologyService( Config config, SslPolicy sslPolicy, LogProvider logProvider, + public TopologyService topologyService( Config config, LogProvider logProvider, JobScheduler jobScheduler, MemberId myself, HostnameResolver hostnameResolver, TopologyServiceRetryStrategy topologyServiceRetryStrategy ) { configureHazelcast( config ); - return new HazelcastClient( new HazelcastClientConnector( config, logProvider, sslPolicy, hostnameResolver ), jobScheduler, + return new HazelcastClient( new HazelcastClientConnector( config, logProvider, hostnameResolver ), jobScheduler, logProvider, config, myself, topologyServiceRetryStrategy ); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/NoOpPipelineHandlerAppender.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/NoOpPipelineHandlerAppender.java new file mode 100644 index 0000000000000..e2dadd3e229bd --- /dev/null +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/NoOpPipelineHandlerAppender.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2002-2017 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j 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 . + */ +package org.neo4j.causalclustering.handlers; + +import org.neo4j.kernel.configuration.Config; +import org.neo4j.logging.LogProvider; + +public class NoOpPipelineHandlerAppender implements PipelineHandlerAppender +{ + public NoOpPipelineHandlerAppender( Config config, LogProvider logProvider ) + { + } +} diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/NoOpPipelineHandlerAppenderFactory.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/NoOpPipelineHandlerAppenderFactory.java new file mode 100644 index 0000000000000..4f887411d3fb5 --- /dev/null +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/NoOpPipelineHandlerAppenderFactory.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2002-2017 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j 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 . + */ +package org.neo4j.causalclustering.handlers; + +import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.impl.util.Dependencies; +import org.neo4j.logging.LogProvider; + +public class NoOpPipelineHandlerAppenderFactory implements PipelineHandlerAppenderFactory +{ + public PipelineHandlerAppender create( Config config, Dependencies dependencies, LogProvider logProvider ) + { + return new NoOpPipelineHandlerAppender( config, logProvider ); + } +} diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/PipelineHandlerAppender.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/PipelineHandlerAppender.java new file mode 100644 index 0000000000000..4705d04cc8b9d --- /dev/null +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/PipelineHandlerAppender.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2002-2017 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j 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 . + */ +package org.neo4j.causalclustering.handlers; + +import io.netty.channel.Channel; +import io.netty.channel.ChannelPipeline; + +public interface PipelineHandlerAppender +{ + default void addPipelineHandlerForServer( ChannelPipeline pipeline, Channel ch ) throws Exception + { + + } + + default void addPipelineHandlerForClient( ChannelPipeline pipeline, Channel ch ) throws Exception + { + + } +} diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/PipelineHandlerAppenderFactory.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/PipelineHandlerAppenderFactory.java new file mode 100644 index 0000000000000..7fbea1affd6f7 --- /dev/null +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/handlers/PipelineHandlerAppenderFactory.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2002-2017 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j 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 . + */ +package org.neo4j.causalclustering.handlers; + +import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.impl.util.Dependencies; +import org.neo4j.logging.LogProvider; + +public interface PipelineHandlerAppenderFactory +{ + PipelineHandlerAppender create( Config config, Dependencies dependencies, LogProvider logProvider ); +} diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/RaftChannelInitializer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/RaftChannelInitializer.java index 4e92605719860..a7589f341b4ac 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/RaftChannelInitializer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/RaftChannelInitializer.java @@ -29,27 +29,27 @@ import org.neo4j.causalclustering.handlers.ExceptionLoggingHandler; import org.neo4j.causalclustering.handlers.ExceptionMonitoringHandler; import org.neo4j.causalclustering.handlers.ExceptionSwallowingHandler; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppender; import org.neo4j.causalclustering.messaging.marshalling.ChannelMarshal; import org.neo4j.causalclustering.messaging.marshalling.RaftMessageEncoder; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; -import org.neo4j.ssl.SslPolicy; public class RaftChannelInitializer extends ChannelInitializer { private final ChannelMarshal marshal; private final Log log; private final Monitors monitors; - private final SslPolicy sslPolicy; + private final PipelineHandlerAppender pipelineAppender; public RaftChannelInitializer( ChannelMarshal marshal, LogProvider logProvider, - Monitors monitors, SslPolicy sslPolicy ) + Monitors monitors, PipelineHandlerAppender pipelineAppender ) { this.marshal = marshal; this.log = logProvider.getLog( getClass() ); this.monitors = monitors; - this.sslPolicy = sslPolicy; + this.pipelineAppender = pipelineAppender; } @Override @@ -57,10 +57,7 @@ protected void initChannel( SocketChannel ch ) throws Exception { ChannelPipeline pipeline = ch.pipeline(); - if ( sslPolicy != null ) - { - pipeline.addLast( sslPolicy.nettyClientHandler( ch ) ); - } + pipelineAppender.addPipelineHandlerForClient( pipeline, ch ); pipeline.addLast( "frameEncoder", new LengthFieldPrepender( 4 ) ); pipeline.addLast( new VersionPrepender() ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java index 85a04ec96f50d..1c5a02facc382 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java @@ -48,6 +48,9 @@ import org.neo4j.causalclustering.discovery.TopologyServiceMultiRetryStrategy; import org.neo4j.causalclustering.discovery.TopologyServiceRetryStrategy; import org.neo4j.causalclustering.discovery.procedures.ReadReplicaRoleProcedure; +import org.neo4j.causalclustering.handlers.NoOpPipelineHandlerAppenderFactory; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppender; +import org.neo4j.causalclustering.handlers.PipelineHandlerAppenderFactory; import org.neo4j.causalclustering.helper.ExponentialBackoffStrategy; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.com.storecopy.StoreUtil; @@ -61,7 +64,6 @@ import org.neo4j.kernel.api.bolt.BoltConnectionTracker; import org.neo4j.kernel.api.exceptions.KernelException; import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.configuration.ssl.SslPolicyLoader; import org.neo4j.kernel.enterprise.builtinprocs.EnterpriseBuiltInDbmsProcedures; import org.neo4j.kernel.impl.api.CommitProcessFactory; import org.neo4j.kernel.impl.api.ReadOnlyTransactionCommitProcess; @@ -95,6 +97,7 @@ import org.neo4j.kernel.impl.transaction.log.TransactionAppender; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; +import org.neo4j.kernel.impl.util.Dependencies; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.internal.DefaultKernelData; import org.neo4j.kernel.lifecycle.LifeSupport; @@ -102,7 +105,6 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; -import org.neo4j.ssl.SslPolicy; import org.neo4j.storageengine.api.StorageEngine; import org.neo4j.time.Clocks; import org.neo4j.udc.UsageData; @@ -178,19 +180,22 @@ public class EnterpriseReadReplicaEditionModule extends EditionModule logProvider.getLog( getClass() ).info( String.format( "Generated new id: %s", myself ) ); - SslPolicyLoader sslPolicyFactory = dependencies.satisfyDependency( SslPolicyLoader.create( config, logProvider ) ); - SslPolicy clusterSslPolicy = sslPolicyFactory.getPolicy( config.get( CausalClusteringSettings.ssl_policy ) ); HostnameResolver hostnameResolver = chooseResolver( config, logProvider, userLogProvider ); + configureDiscoveryService( discoveryServiceFactory, dependencies, config, logProvider ); + TopologyService topologyService = - discoveryServiceFactory.topologyService( config, clusterSslPolicy, logProvider, platformModule.jobScheduler, myself, + discoveryServiceFactory.topologyService( config, logProvider, platformModule.jobScheduler, myself, hostnameResolver, resolveStrategy( config ) ); life.add( dependencies.satisfyDependency( topologyService ) ); + PipelineHandlerAppenderFactory appenderFactory = appenderFactory(); + PipelineHandlerAppender handlerAppender = appenderFactory.create( config, dependencies, logProvider ); + long inactivityTimeoutMillis = config.get( CausalClusteringSettings.catch_up_client_inactivity_timeout ).toMillis(); CatchUpClient catchUpClient = - life.add( new CatchUpClient( logProvider, Clocks.systemClock(), inactivityTimeoutMillis, monitors, clusterSslPolicy ) ); + life.add( new CatchUpClient( logProvider, Clocks.systemClock(), inactivityTimeoutMillis, monitors, handlerAppender ) ); final Supplier databaseHealthSupplier = dependencies.provideDependency( DatabaseHealth.class ); @@ -283,7 +288,7 @@ private OnlineBackupKernelExtension pickBackupExtension( NeoStoreDataSource data platformModule.dependencies.provideDependency( TransactionIdStore.class ), platformModule.dependencies.provideDependency( LogicalTransactionStore.class ), localDatabase::dataSource, localDatabase::isAvailable, null, config, platformModule.monitors, new CheckpointerSupplier( platformModule.dependencies ), fileSystem, pageCache, - platformModule.storeCopyCheckPointMutex, clusterSslPolicy ); + platformModule.storeCopyCheckPointMutex, handlerAppender ); servicesToStopOnStoreCopy.add( catchupServer ); @@ -292,6 +297,16 @@ null, config, platformModule.monitors, new CheckpointerSupplier( platformModule. life.add( catchupServer ); // must start last and stop first, since it handles external requests } + protected void configureDiscoveryService( DiscoveryServiceFactory discoveryServiceFactory, Dependencies dependencies, + Config config, LogProvider logProvider ) + { + } + + protected PipelineHandlerAppenderFactory appenderFactory() + { + return new NoOpPipelineHandlerAppenderFactory(); + } + static Predicate fileWatcherFileNameFilter() { return Predicates.any( fileName -> fileName.startsWith( PhysicalLogFile.DEFAULT_NAME ), diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/ReadReplicaGraphDatabase.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/ReadReplicaGraphDatabase.java index 5c2cb71d89440..833f3069572b9 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/ReadReplicaGraphDatabase.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/ReadReplicaGraphDatabase.java @@ -36,6 +36,10 @@ public class ReadReplicaGraphDatabase extends GraphDatabaseFacade { + protected ReadReplicaGraphDatabase() + { + } + public ReadReplicaGraphDatabase( File storeDir, Config config, Dependencies dependencies ) { this( storeDir, config, dependencies, new HazelcastDiscoveryServiceFactory(), new MemberId( UUID.randomUUID() ) ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/Cluster.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/Cluster.java index a4acfc1393fbe..f42896c3dc01d 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/Cluster.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/Cluster.java @@ -74,15 +74,15 @@ public class Cluster private static final int DEFAULT_TIMEOUT_MS = 120_000; private static final int DEFAULT_CLUSTER_SIZE = 3; - private final File parentDir; + protected final File parentDir; private final Map coreParams; private final Map> instanceCoreParams; private final Map readReplicaParams; private final Map> instanceReadReplicaParams; private final String recordFormat; - private final DiscoveryServiceFactory discoveryServiceFactory; - private final String listenAddress; - private final String advertisedAddress; + protected final DiscoveryServiceFactory discoveryServiceFactory; + protected final String listenAddress; + protected final String advertisedAddress; private Map coreMembers = new ConcurrentHashMap<>(); private Map readReplicas = new ConcurrentHashMap<>(); @@ -433,7 +433,7 @@ private void createCoreMembers( final int noOfCoreMembers, } } - private CoreClusterMember createCoreClusterMember( int serverId, + protected CoreClusterMember createCoreClusterMember( int serverId, int hazelcastPort, int clusterSize, List initialHosts, diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/CoreClusterMember.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/CoreClusterMember.java index c5e60eae0bbd4..e9b03a61437f9 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/CoreClusterMember.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/CoreClusterMember.java @@ -45,6 +45,7 @@ import org.neo4j.kernel.configuration.HttpConnector; import org.neo4j.kernel.configuration.HttpConnector.Encryption; import org.neo4j.kernel.configuration.Settings; +import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.logging.Level; import static java.lang.String.format; @@ -54,18 +55,18 @@ import static org.neo4j.helpers.ListenSocketAddress.listenAddress; import static org.neo4j.helpers.collection.MapUtil.stringMap; -public class CoreClusterMember implements ClusterMember +public class CoreClusterMember implements ClusterMember { private final File neo4jHome; - private final DiscoveryServiceFactory discoveryServiceFactory; - private final File storeDir; + protected final DiscoveryServiceFactory discoveryServiceFactory; + protected final File storeDir; private final File clusterStateDir; private final File raftLogDir; private final Map config = stringMap(); private final int serverId; private final String boltAdvertisedSocketAddress; private final int discoveryPort; - private CoreGraphDatabase database; + protected CoreGraphDatabase database; public CoreClusterMember( int serverId, int discoveryPort, diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/ReadReplica.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/ReadReplica.java index a181cddf14628..6d9c781a97c47 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/ReadReplica.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/ReadReplica.java @@ -48,14 +48,14 @@ public class ReadReplica implements ClusterMember { - private final Map config = stringMap(); - private final DiscoveryServiceFactory discoveryServiceFactory; + protected final Map config = stringMap(); + protected final DiscoveryServiceFactory discoveryServiceFactory; private final File neo4jHome; - private final File storeDir; + protected final File storeDir; private final int serverId; private final String boltAdvertisedSocketAddress; - private ReadReplicaGraphDatabase database; - private Monitors monitors; + protected ReadReplicaGraphDatabase database; + protected Monitors monitors; public ReadReplica( File parentDir, int serverId, int boltPort, int httpPort, int txPort, int backupPort, DiscoveryServiceFactory discoveryServiceFactory, diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryService.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryService.java index 7f551c12f8f9f..5338d405cc9e4 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryService.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryService.java @@ -33,7 +33,6 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.LogProvider; import org.neo4j.scheduler.JobScheduler; -import org.neo4j.ssl.SslPolicy; import static java.util.Collections.unmodifiableMap; @@ -48,7 +47,7 @@ public class SharedDiscoveryService implements DiscoveryServiceFactory private ClusterId clusterId; @Override - public CoreTopologyService coreTopologyService( Config config, SslPolicy sslPolicy, MemberId myself, JobScheduler jobScheduler, + public CoreTopologyService coreTopologyService( Config config, MemberId myself, JobScheduler jobScheduler, LogProvider logProvider, LogProvider userLogProvider, HostnameResolver hostnameResolver, TopologyServiceRetryStrategy topologyServiceRetryStrategy ) { @@ -60,7 +59,7 @@ public CoreTopologyService coreTopologyService( Config config, SslPolicy sslPoli } @Override - public TopologyService topologyService( Config config, SslPolicy sslPolicy, LogProvider logProvider, + public TopologyService topologyService( Config config, LogProvider logProvider, JobScheduler jobScheduler, MemberId myself, HostnameResolver hostnameResolver, TopologyServiceRetryStrategy topologyServiceRetryStrategy ) { diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java index 45a8964442096..1becba84f3291 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java @@ -19,9 +19,6 @@ */ package org.neo4j.causalclustering.discovery; -import org.junit.Test; -import org.mockito.ArgumentCaptor; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -33,6 +30,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + import org.neo4j.causalclustering.core.CausalClusteringSettings; import org.neo4j.causalclustering.core.consensus.RaftMachine; import org.neo4j.causalclustering.identity.MemberId; @@ -97,7 +97,7 @@ private Callable createDiscoveryJob( MemberId member, DiscoveryServiceFact HostnameResolver hostnameResolver = new NoOpHostnameResolver(); CoreTopologyService topologyService = disoveryServiceFactory - .coreTopologyService( config(), null, member, jobScheduler, logProvider, userLogProvider, hostnameResolver, + .coreTopologyService( config(), member, jobScheduler, logProvider, userLogProvider, hostnameResolver, new TopologyServiceNoRetriesStrategy() ); return sharedClientStarter( topologyService, expectedTargetSet ); } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/SecureClusterIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/SecureClusterIT.java deleted file mode 100644 index 568091f30edbc..0000000000000 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/SecureClusterIT.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (c) 2002-2017 "Neo Technology," - * Network Engine for Objects in Lund AB [http://neotechnology.com] - * - * This file is part of Neo4j. - * - * Neo4j 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 . - */ -package org.neo4j.causalclustering.scenarios; - -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; - -import java.io.File; -import java.util.Map; - -import org.neo4j.causalclustering.core.CausalClusteringSettings; -import org.neo4j.causalclustering.discovery.Cluster; -import org.neo4j.causalclustering.discovery.CoreClusterMember; -import org.neo4j.causalclustering.discovery.HazelcastDiscoveryServiceFactory; -import org.neo4j.causalclustering.discovery.IpFamily; -import org.neo4j.causalclustering.discovery.ReadReplica; -import org.neo4j.graphdb.Node; -import org.neo4j.kernel.configuration.ssl.SslPolicyConfig; -import org.neo4j.kernel.impl.store.format.standard.Standard; -import org.neo4j.ssl.SslResourceBuilder; -import org.neo4j.test.rule.TestDirectory; -import org.neo4j.test.rule.fs.DefaultFileSystemRule; - -import static java.util.Collections.emptyMap; -import static org.neo4j.causalclustering.discovery.Cluster.dataMatchesEventually; -import static org.neo4j.graphdb.Label.label; -import static org.neo4j.helpers.collection.MapUtil.stringMap; - -public class SecureClusterIT -{ - @Rule - public TestDirectory testDir = TestDirectory.testDirectory(); - - @Rule - public DefaultFileSystemRule fsRule = new DefaultFileSystemRule(); - - private Cluster cluster; - - @After - public void cleanup() throws Exception - { - if ( cluster != null ) - { - cluster.shutdown(); - } - } - - @Test - public void shouldReplicateInSecureCluster() throws Exception - { - // given - String sslPolicyName = "cluster"; - SslPolicyConfig policyConfig = new SslPolicyConfig( sslPolicyName ); - - Map coreParams = stringMap( - CausalClusteringSettings.ssl_policy.name(), sslPolicyName, - policyConfig.base_directory.name(), "certificates/cluster" - ); - Map readReplicaParams = stringMap( - CausalClusteringSettings.ssl_policy.name(), sslPolicyName, - policyConfig.base_directory.name(), "certificates/cluster" - ); - - int noOfCoreMembers = 3; - int noOfReadReplicas = 3; - - cluster = new Cluster( testDir.absolutePath(), noOfCoreMembers, noOfReadReplicas, - new HazelcastDiscoveryServiceFactory(), coreParams, emptyMap(), readReplicaParams, - emptyMap(), Standard.LATEST_NAME, IpFamily.IPV4, false ); - - // install the cryptographic objects for each core - for ( CoreClusterMember core : cluster.coreMembers() ) - { - File homeDir = cluster.getCoreMemberById( core.serverId() ).homeDir(); - File baseDir = new File( homeDir, "certificates/cluster" ); - fsRule.mkdirs( new File( baseDir, "trusted" ) ); - fsRule.mkdirs( new File( baseDir, "revoked" ) ); - - int keyId = core.serverId(); - SslResourceBuilder.caSignedKeyId( keyId ) - .trustSignedByCA().install( baseDir ); - } - - // install the cryptographic objects for each read replica - for ( ReadReplica replica : cluster.readReplicas() ) - { - File homeDir = cluster.getReadReplicaById( replica.serverId() ).homeDir(); - File baseDir = new File( homeDir, "certificates/cluster" ); - fsRule.mkdirs( new File( baseDir, "trusted" ) ); - fsRule.mkdirs( new File( baseDir, "revoked" ) ); - - int keyId = replica.serverId() + noOfCoreMembers; - SslResourceBuilder.caSignedKeyId( keyId ) - .trustSignedByCA().install( baseDir ); - } - - // when - cluster.start(); - - CoreClusterMember leader = cluster.coreTx( ( db, tx ) -> - { - Node node = db.createNode( label( "boo" ) ); - node.setProperty( "foobar", "baz_bat" ); - tx.success(); - } ); - - // then - dataMatchesEventually( leader, cluster.coreMembers() ); - dataMatchesEventually( leader, cluster.readReplicas() ); - } -}