Merge dev changes into mainline

.gitignore

@@ -10,4 +10,4 @@ go.work.sum
 .kiro/
 credentials-fetcher
 /opensource/bin
-/opensource/build
+/opensource/build

LICENSE.txt

@@ -0,0 +1,203 @@
+
+                                 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:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) 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
+
+      (d) 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
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

cmd/credentials-fetcher/main.go

@@ -18,6 +18,15 @@ import (
 var log = logger.GetInstance()
 
 func main() {
+	// Health check mode — just verify the socket exists and exit
+	if len(os.Args) > 1 && os.Args[1] == "--healthcheck" {
+		socketPath := "/var/credentials-fetcher/socket/credentials_fetcher.sock"
+		if _, err := os.Stat(socketPath); err != nil {
+			os.Exit(1)
+		}
+		os.Exit(0)
+	}
+
 	log.Info("Starting Credentials Fetcher Daemon", "version", constants.Version)
 
 	// Ensure logger is closed on exit
@@ -46,18 +55,21 @@ func main() {
 	if isSystemd {
 		log.Info("Running under systemd")
 	} else {
-		log.Info("Not running under systemd, watchdog notifications will be simulated")
+		log.Info("Not running under systemd, skipping watchdog")
 	}
 
-	// Create the watchdog
-	wd, err := watchdog.GetInstance()
-	if err != nil {
-		log.Error("Failed to create watchdog", "error", err)
-		os.Exit(1)
+	// Create the watchdog (only used under systemd)
+	var wd *watchdog.Watchdog
+	if isSystemd {
+		var err error
+		wd, err = watchdog.GetInstance()
+		if err != nil {
+			log.Error("Failed to create watchdog", "error", err)
+			os.Exit(1)
+		}
+		log.Info("Watchdog created successfully")
 	}
 
-	log.Info("Watchdog created successfully")
-
 	// Create the gRPC server
 	server := grpc.NewCredentialsFetcherServer(constants.DefaultKrbFilesDir, constants.DefaultAWSSecretName)
 
@@ -67,9 +79,12 @@ func main() {
 	var wg sync.WaitGroup
 	wg.Add(constants.NumberofWaitGroups)
 
-	// Start the watchdog in its own goroutine
+	// Start the watchdog in its own goroutine (only under systemd)
 	go func() {
 		defer wg.Done()
+		if !isSystemd {
+			return
+		}
 		log.Info("Starting watchdog goroutine")
 		if err := wd.Start(ctx); err != nil {
 			log.Error("Watchdog error", "error", err)
@@ -107,6 +122,9 @@ func main() {
 		}
 
 		// Continue checking at regular intervals
+		cleanupTicker := time.NewTicker(1 * time.Hour)
+		defer cleanupTicker.Stop()
+
 		for {
 			select {
 			case <-ctx.Done():
@@ -118,6 +136,8 @@ func main() {
 					log.Error("Ticket renewal check failed", "error", err)
 					// Continue running even if a check fails
 				}
+			case <-cleanupTicker.C:
+				krbClient.CleanupOrphanedTickets(constants.DefaultKrbFilesDir)
 			}
 		}
 	}()

configuration/conf/credentials-fetcher-logrotate

@@ -0,0 +1,8 @@
+/var/credentials-fetcher/logging/credentials-fetcher.log {
+    size 50M
+    rotate 3
+    compress
+    missingok
+    notifempty
+    copytruncate
+}

constants/constants.go

@@ -77,8 +77,11 @@ const (
 	MaxPasswordLength = 104
 	MaxDomainLength   = 253
 
-	// InvalidUsernameChars contains characters not allowed in username
-	InvalidUsernameChars = "&:][+|;$*?<>!/\\\\'`~"
+	// InvalidSAMAccountNameChars contains characters not allowed in AD sAMAccountName logon names.
+	// References:
+	//   - https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-2000-server/bb726984(v=technet.10)
+	//   - https://learn.microsoft.com/en-us/troubleshoot/windows-server/active-directory/naming-conventions-for-computer-domain-site-ou
+	InvalidSAMAccountNameChars = "\"/:;|=,+*?<>\\][&$!'`~(){} "
 
 	// DomainRegexPattern is the regex pattern for validating domain names
 	DomainRegexPattern = `^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$`

credentials-fetcher.spec

@@ -3,7 +3,7 @@
 
 %global major_version 2
 %global minor_version 0
-%global patch_version 1
+%global patch_version 2
 
 Name: credentials-fetcher
 Version: %{major_version}.%{minor_version}.%{patch_version}
@@ -84,6 +84,7 @@ cp ./configuration/conf/krb5.conf %{buildroot}/usr/sbin/krb5.conf
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
+%license LICENSE.txt
 /usr/sbin/credentials-fetcher
 /usr/sbin/krb5.conf
 %config(noreplace) /etc/credentials-fetcher.conf
@@ -98,6 +99,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %post
 chmod 644 %{_unitdir}/%{SERVICE_NAME}
 /usr/bin/systemctl daemon-reload
+/usr/bin/systemctl enable %{SERVICE_NAME}
 # Since `ecs.service` gets a new dependency on `credentials-fetcher.service`, it stops on the initial reload. Start it back up if enabled
 /usr/bin/systemctl is-enabled --quiet ecs.service 2>/dev/null && /usr/bin/systemctl restart ecs.service || :
 
@@ -118,6 +120,16 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
+* Fri May 29 2026 Muskan Lalit <muskanl@amazon.com>
+- Set DomainlessUser for AddKerberosArnLease to enable renewals in Fargate managed mode
+- Support blue/green username rotation for non-domain-joined mode
+- Eliminate GMSA ticket expiry gap during renewal
+- Add log file rotation at 10MB
+- Remove orphaned tickets after 7 days past renewal
+- Skip Secrets Manager fallback when DomainlessUser is set
+- Fix invalid char blocklist in AD account name and UTF-8 BOM parsing in credential spec 
+- Add Fedora packaging files
+
 * Mon Feb 23 2026 Samiullah Mohammed <samiull@amazon.com> - 2.0.1
 - Update ticket renewal logic to fetch username from secret