From 6564f8de7257df9c1e801ab9507241264edfe240 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 5 Jun 2024 08:39:37 -0400 Subject: [PATCH 1/9] Update license material --- confluent_client/COPYRIGHT | 60 +++++++++++++++++++++++++- confluent_server/COPYRIGHT | 87 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 142 insertions(+), 5 deletions(-) diff --git a/confluent_client/COPYRIGHT b/confluent_client/COPYRIGHT index 6bcd9986..6f435939 100644 --- a/confluent_client/COPYRIGHT +++ b/confluent_client/COPYRIGHT @@ -1,6 +1,8 @@ -Name: confluent-client Project: https://hpc.lenovo.com/users/ Source: https://github.com/lenovo/confluent +Upstream-Name: confluent-client + +All file of the Confluent-client software is distributed under the terms of an Apache-2.0 license as indicated below: Files: * Copyright: 2014-2019 Lenovo @@ -11,7 +13,8 @@ Copyright: 2014 IBM Corporation 2015-2019 Lenovo License: Apache-2.0 -File: sortutil.py +File: sortutil.py, + tlvdata.py Copyright: 2014 IBM Corporation 2015-2016 Lenovo License: Apache-2.0 @@ -19,3 +22,56 @@ License: Apache-2.0 File: tlv.py Copyright: 2014 IBM Corporation License: Apache-2.0 + +License: Apache-2.0 +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/confluent_server/COPYRIGHT b/confluent_server/COPYRIGHT index 6bcd9986..05d7bac2 100644 --- a/confluent_server/COPYRIGHT +++ b/confluent_server/COPYRIGHT @@ -1,21 +1,102 @@ -Name: confluent-client Project: https://hpc.lenovo.com/users/ Source: https://github.com/lenovo/confluent +Upstream-Name: confluent-client + +All file of the Confluent-client software is distributed under the terms of an Apache-2.0 license as indicated below: Files: * -Copyright: 2014-2019 Lenovo +Copyright: 2014-2023 Lenovo License: Apache-2.0 -File: client.py: +File: client.py + sockapi.py + redfish.py + attributes.py + httpapi.py + configmanager.py Copyright: 2014 IBM Corporation 2015-2019 Lenovo License: Apache-2.0 File: sortutil.py + log.py Copyright: 2014 IBM Corporation 2015-2016 Lenovo License: Apache-2.0 +File: util.py + noderange.py + main.py + exceptions.py +Copyright: 2014 IBM Corporation + 2015-2017 Lenovo +License: Apache-2.0 + +File: ipmi.py + plugin.py + core.py + consoleserver.py +Copyright: 2014 IBM Corporation + 2015-2018 Lenovo +License: Apache-2.0 + File: tlv.py + shellmodule.py + conf.py + auth.py Copyright: 2014 IBM Corporation License: Apache-2.0 + + +License: Apache-2.0 +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS \ No newline at end of file From 451e3ba224e572da4f9820f9ca1b0f487c1cbf7d Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 6 Jun 2024 09:02:45 -0400 Subject: [PATCH 2/9] Add nodeapply man page --- confluent_client/doc/man/nodeapply.ronn | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 confluent_client/doc/man/nodeapply.ronn diff --git a/confluent_client/doc/man/nodeapply.ronn b/confluent_client/doc/man/nodeapply.ronn new file mode 100644 index 00000000..dae35025 --- /dev/null +++ b/confluent_client/doc/man/nodeapply.ronn @@ -0,0 +1,30 @@ +nodeapply(8) -- Execute command on many nodes in a noderange through ssh +========================================================================= + +## SYNOPSIS + +`nodeapply [options] ` + +## DESCRIPTION + +Provides shortcut access to a number of common operations against deployed +nodes. These operations include refreshing ssh certificates and configuration, +rerunning syncflies, and executing specified postscripts. + +## OPTIONS + +* `-k`, `--security` + Refresh SSH configuration (hosts.equiv and node SSH certificates) + +* `-F`, `--sync` + Rerun syncfiles from deployed profile + +* `-P SCRIPTS`, `--scripts=SCRIPTS` + Re-run specified scripts, with full path under scripts specified, e.g. post.d/scriptname,firstboot.d/otherscriptname + +* `-c COUNT`, `-f COUNT`, `--count=COUNT` + Specify the maximum number of instances to run concurrently + +* `-m MAXNODES`, `--maxnodes=MAXNODES` + Specify a maximum number of nodes to run remote ssh command to, prompting + if over the threshold From 5d416cb1b1e6df6b967c78ab9456f15d0c31d0d6 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 6 Jun 2024 11:23:28 -0400 Subject: [PATCH 3/9] Remove disused dependency list --- confluent_server/requirements.txt | 3 --- confluent_server/setup.py.tmpl | 3 --- 2 files changed, 6 deletions(-) diff --git a/confluent_server/requirements.txt b/confluent_server/requirements.txt index d0be6908..e69de29b 100644 --- a/confluent_server/requirements.txt +++ b/confluent_server/requirements.txt @@ -1,3 +0,0 @@ -confluent_client>=0.1 -pycrypto>=2.6 -pyparsing diff --git a/confluent_server/setup.py.tmpl b/confluent_server/setup.py.tmpl index 871497e3..8987e19d 100644 --- a/confluent_server/setup.py.tmpl +++ b/confluent_server/setup.py.tmpl @@ -23,9 +23,6 @@ setup( 'confluent/plugins/shell/', 'confluent/collective/', 'confluent/plugins/configuration/'], - install_requires=['paramiko', 'pycrypto>=2.6', 'confluent_client>=0.1.0', 'eventlet', - 'dnspython', 'netifaces', 'pysnmp', 'pyparsing', - 'pyghmi>=1.0.44'], scripts=['bin/confluent', 'bin/confluent_selfcheck', 'bin/confluentdbutil', 'bin/collective', 'bin/osdeploy'], data_files=[('/etc/init.d', ['sysvinit/confluent']), ('/usr/lib/sysctl.d', ['sysctl/confluent.conf']), From 38a95131f905f28ef3b4692e5176868f2e22c0c9 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 7 Jun 2024 09:36:18 -0400 Subject: [PATCH 4/9] Add more error handling in vtbufferd --- confluent_vtbufferd/vtbufferd.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/confluent_vtbufferd/vtbufferd.c b/confluent_vtbufferd/vtbufferd.c index 055a5263..bbcaba6b 100644 --- a/confluent_vtbufferd/vtbufferd.c +++ b/confluent_vtbufferd/vtbufferd.c @@ -232,10 +232,11 @@ int main(int argc, char* argv[]) { int numevts; int status; int poller; - int n; + int n, rt; socklen_t len; - int ctlsock, currsock; - socklen_t addrlen; + int ctlsock = 0; + int currsock = 0; + socklen_t addrlen = 0; struct ucred ucr; struct epoll_event epvt, evts[MAXEVTS]; @@ -247,6 +248,10 @@ int main(int argc, char* argv[]) { addr.sun_family = AF_UNIX; strncpy(addr.sun_path + 1, argv[1], sizeof(addr.sun_path) - 2); // abstract namespace socket ctlsock = socket(AF_UNIX, SOCK_STREAM, 0); + if (ctlsock < 0) { + perror("Unable to open unix socket - "); + exit(1); + } status = bind(ctlsock, (const struct sockaddr*)&addr, sizeof(sa_family_t) + strlen(argv[1]) + 1); //sizeof(struct sockaddr_un)); if (status < 0) { perror("Unable to open unix socket - "); @@ -272,7 +277,11 @@ int main(int argc, char* argv[]) { if (evts[n].data.fd == ctlsock) { currsock = accept(ctlsock, (struct sockaddr *) &addr, &addrlen); len = sizeof(ucr); - getsockopt(currsock, SOL_SOCKET, SO_PEERCRED, &ucr, &len); + rt = getsockopt(currsock, SOL_SOCKET, SO_PEERCRED, &ucr, &len); + if (rt < 0) { + close(currsock); + continue; + } if (ucr.uid != getuid()) { // block access for other users close(currsock); continue; From c6adf8175a42c5d479d60142fb75651e88efee6e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 7 Jun 2024 11:03:00 -0400 Subject: [PATCH 5/9] Try processing driver disks before udevadm invocation --- .../lib/dracut/hooks/pre-trigger/01-confluent.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh index 8701cc7e..62f406ed 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh @@ -1,6 +1,13 @@ #!/bin/sh [ -e /tmp/confluent.initq ] && return 0 . /lib/dracut-lib.sh +if [ -f /tmp/dd_disk ]; then + for dd in $(cat /tmp/dd_disk); do + if [ -e $dd ]; then + driver-updates --disk $dd $dd + fi + done +fi setsid sh -c 'exec bash <> /dev/tty2 >&0 2>&1' & udevadm trigger udevadm trigger --type=devices --action=add @@ -20,13 +27,6 @@ function confluentpython() { /usr/bin/python2 $* fi } -if [ -f /tmp/dd_disk ]; then - for dd in $(cat /tmp/dd_disk); do - if [ -e $dd ]; then - driver-updates --disk $dd $dd - fi - done -fi vlaninfo=$(getarg vlan) if [ ! -z "$vlaninfo" ]; then vldev=${vlaninfo#*:} From 517242df476df7e55bb9edb0a824cec0e1c2c358 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 7 Jun 2024 11:36:39 -0400 Subject: [PATCH 6/9] Avoid double run of driver disk content --- .../usr/lib/dracut/hooks/pre-trigger/01-confluent.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh index 62f406ed..84b75451 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh @@ -1,14 +1,16 @@ #!/bin/sh [ -e /tmp/confluent.initq ] && return 0 . /lib/dracut-lib.sh +setsid sh -c 'exec bash <> /dev/tty2 >&0 2>&1' & if [ -f /tmp/dd_disk ]; then for dd in $(cat /tmp/dd_disk); do if [ -e $dd ]; then driver-updates --disk $dd $dd + rm $dd fi done + rm /tmp/dd_disk fi -setsid sh -c 'exec bash <> /dev/tty2 >&0 2>&1' & udevadm trigger udevadm trigger --type=devices --action=add udevadm settle From 663b3208682297eccbcdd160f4e36c998ef4d40c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 7 Jun 2024 12:43:15 -0400 Subject: [PATCH 7/9] Add more bounds checking in copernicus --- confluent_osdeploy/utils/copernicus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/confluent_osdeploy/utils/copernicus.c b/confluent_osdeploy/utils/copernicus.c index 9c8ace60..526c06d2 100644 --- a/confluent_osdeploy/utils/copernicus.c +++ b/confluent_osdeploy/utils/copernicus.c @@ -31,6 +31,8 @@ int add_uuid(char* destination, int maxsize) { strncpy(destination, "/uuid=", maxsize); uuidsize = read(uuidf, destination + 6, maxsize - 6); close(uuidf); + if (uuidsize < 0) { return 0; } + if (uuidsize > 524288) { return 0; } if (destination[uuidsize + 5] == '\n') { destination[uuidsize + 5 ] = 0; } @@ -42,9 +44,11 @@ int add_confluent_uuid(char* destination, int maxsize) { int uuidsize; uuidf = open("/confluent_uuid", O_RDONLY); if (uuidf < 0) { return 0; } - strncpy(destination, "/confluentuuid=", maxsize); uuidsize = read(uuidf, destination + 15, maxsize - 15); close(uuidf); + if (uuidsize < 0) { return 0; } + if (uuidsize > 524288) { return 0; } + strncpy(destination, "/confluentuuid=", maxsize); if (destination[uuidsize + 14] == '\n') { destination[uuidsize + 14] = 0; } From 8db638262909a9f92cd0ea175bc3a68b4e3581b5 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 11 Jun 2024 09:25:57 -0400 Subject: [PATCH 8/9] Change autoversion scheme for dev builds We need to be compliant with python versioning for the tools to keep working --- confluent_server/makesetup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/makesetup b/confluent_server/makesetup index f20e2d25..de39ea18 100755 --- a/confluent_server/makesetup +++ b/confluent_server/makesetup @@ -2,7 +2,7 @@ cd `dirname $0` VERSION=`git describe|cut -d- -f 1` NUMCOMMITS=`git describe|cut -d- -f 2` if [ "$NUMCOMMITS" != "$VERSION" ]; then - VERSION=$VERSION.dev$NUMCOMMITS.g`git describe|cut -d- -f 3` + VERSION=$VERSION.dev$NUMCOMMITS+g`git describe|cut -d- -f 3` fi echo $VERSION > VERSION sed -e "s/#VERSION#/$VERSION/" setup.py.tmpl > setup.py From d06be555684139a7a00de2bdac62a4a656587740 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 11 Jun 2024 15:51:02 -0400 Subject: [PATCH 9/9] Add dependencies for Ubuntu Noble --- confluent_server/builddeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/builddeb b/confluent_server/builddeb index f71bfce4..4071b5b1 100755 --- a/confluent_server/builddeb +++ b/confluent_server/builddeb @@ -36,7 +36,7 @@ if [ "$OPKGNAME" = "confluent-server" ]; then if grep wheezy /etc/os-release; then sed -i 's/^\(Depends:.*\)/\1, python-confluent-client, python-lxml, python-eficompressor, python-pycryptodomex, python-dateutil, python-pyopenssl, python-msgpack/' debian/control else - sed -i 's/^\(Depends:.*\)/\1, confluent-client, python3-lxml, python3-eficompressor, python3-pycryptodome, python3-websocket, python3-msgpack, python3-eventlet, python3-pyparsing, python3-pyghmi, python3-paramiko, python3-pysnmp4, python3-libarchive-c, confluent-vtbufferd/' debian/control + sed -i 's/^\(Depends:.*\)/\1, confluent-client, python3-lxml, python3-eficompressor, python3-pycryptodome, python3-websocket, python3-msgpack, python3-eventlet, python3-pyparsing, python3-pyghmi, python3-paramiko, python3-pysnmp4, python3-libarchive-c, confluent-vtbufferd, python3-netifaces, python3-yaml, python3-dateutil, python3-pyasyncore/' debian/control fi if grep wheezy /etc/os-release; then echo 'confluent_client python-confluent-client' >> debian/pydist-overrides