fix: Use offset to prevent re-indexing encrypted headers

cmd/stbak/cmd/archive.go

@@ -107,7 +107,7 @@ var archiveCmd = &cobra.Command{
 			logging.NewLogger().PrintHeader,
 		)
 		if err != nil {
-			return nil
+			return err
 		}
 
 		return recovery.Index(
@@ -130,18 +130,14 @@ var archiveCmd = &cobra.Command{
 			int(lastIndexedRecord),
 			int(lastIndexedBlock),
 			viper.GetBool(overwriteFlag),
+			1, // Ignore the first header, which is the last header which we already indexed
 
 			func(hdr *tar.Header, i int) error {
-				// Ignore the first header, which is the last header which we already indexed
-				if i == 0 {
-					return nil
-				}
-
-				if len(hdrs) <= i-1 {
+				if len(hdrs) <= i {
 					return config.ErrTarHeaderMissing
 				}
 
-				*hdr = *hdrs[i-1]
+				*hdr = *hdrs[i]
 
 				return nil
 			},

cmd/stbak/cmd/recovery_index.go

@@ -68,6 +68,7 @@ var recoveryIndexCmd = &cobra.Command{
 			viper.GetInt(recordFlag),
 			viper.GetInt(blockFlag),
 			viper.GetBool(overwriteFlag),
+			0,
 
 			func(hdr *tar.Header, i int) error {
 				return encryption.DecryptHeader(hdr, viper.GetString(encryptionFlag), identity)

cmd/stbak/cmd/update.go

@@ -113,18 +113,14 @@ var updateCmd = &cobra.Command{
 			int(lastIndexedRecord),
 			int(lastIndexedBlock),
 			false,
+			1, // Ignore the first header, which is the last header which we already indexed
 
 			func(hdr *tar.Header, i int) error {
-				// Ignore the first header, which is the last header which we already indexed
-				if i == 0 {
-					return nil
-				}
-
-				if len(hdrs) <= i-1 {
+				if len(hdrs) <= i {
 					return config.ErrTarHeaderMissing
 				}
 
-				*hdr = *hdrs[i-1]
+				*hdr = *hdrs[i]
 
 				return nil
 			},