Merge pull request #5 from ZaparooProject/comprehensive-ndef-fix

fix: comprehensive NDEF parsing - replace ParseNDEFData with ParseNDEFMessage for all tag types

Author: wizzomafizzo

felica.go

@@ -359,7 +359,7 @@ func (f *FeliCaTag) ReadNDEF() (*NDEFMessage, error) {
 	actualNdefData := ndefData[:ndefLength]
 
 	// Step 8: Parse NDEF data using existing parser
-	return ParseNDEFData(actualNdefData)
+	return ParseNDEFMessage(actualNdefData)
 }
 
 // WriteNDEF writes NDEF data to the FeliCa tag

ndef.go

@@ -75,75 +75,6 @@ type NDEFRecord struct {
 	Payload []byte
 }
 
-// ParseNDEFData parses raw NDEF data into an NDEFMessage
-func ParseNDEFData(data []byte) (*NDEFMessage, error) {
-	// SECURITY: Validate total data size before processing
-	if len(data) > MaxNDEFMessageSize {
-		return nil, fmt.Errorf("%w: data size %d exceeds maximum %d",
-			ErrSecurityViolation, len(data), MaxNDEFMessageSize)
-	}
-
-	if len(data) < 4 {
-		return nil, fmt.Errorf("%w: data too short for NDEF", ErrInvalidNDEF)
-	}
-
-	// Find NDEF start marker
-	startIndex := bytes.LastIndex(data, ndefStart)
-	if startIndex == -1 {
-		return nil, ErrNoNDEF
-	}
-
-	// Check for corrupted data with multiple NDEF starts
-	if len(data) > startIndex+8 {
-		nextStart := bytes.Index(data[startIndex+4:], ndefStart)
-		if nextStart != -1 {
-			startIndex += nextStart + 4
-		}
-	}
-
-	// Find NDEF end marker
-	endIndex := bytes.Index(data[startIndex:], ndefEnd)
-	if endIndex == -1 {
-		return nil, fmt.Errorf("%w: end marker not found", ErrInvalidNDEF)
-	}
-	endIndex += startIndex
-
-	// Validate indices
-	if startIndex >= endIndex {
-		return nil, fmt.Errorf("%w: invalid start index", ErrInvalidNDEF)
-	}
-
-	// SECURITY: Comprehensive bounds checking
-	if startIndex+4 > len(data) {
-		return nil, fmt.Errorf("%w: insufficient data for NDEF header", ErrInvalidNDEF)
-	}
-
-	if endIndex > len(data) {
-		return nil, fmt.Errorf("%w: invalid start index", ErrInvalidNDEF)
-	}
-
-	// SECURITY: Validate text length before extraction
-	textLength := endIndex - (startIndex + 4)
-	if textLength > MaxNDEFPayloadSize {
-		return nil, fmt.Errorf("%w: text payload %d exceeds maximum %d",
-			ErrSecurityViolation, textLength, MaxNDEFPayloadSize)
-	}
-
-	// Extract text from simple text record
-	// TODO: Properly parse full NDEF structure
-	text := string(data[startIndex+4 : endIndex])
-
-	return &NDEFMessage{
-		Records: []NDEFRecord{
-			{
-				Type:    NDEFTypeText,
-				Text:    text,
-				Payload: data[startIndex:endIndex],
-			},
-		},
-	}, nil
-}
-
 // BuildNDEFMessage creates NDEF data from text
 // Deprecated: Use BuildTextMessage or BuildNDEFMessageEx for more flexibility
 func BuildNDEFMessage(text string) ([]byte, error) {

ndef_construction_test.go

@@ -253,7 +253,7 @@ func TestCalculateNDEFHeaderErrors(t *testing.T) {
 	}
 }
 
-func TestParseNDEFDataSecurity(t *testing.T) {
+func TestParseNDEFMessageSecurity(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		errorType error
@@ -285,10 +285,10 @@ func TestParseNDEFDataSecurity(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			data := make([]byte, tt.dataSize)
-			_, err := ParseNDEFData(data)
+			_, err := ParseNDEFMessage(data)
 
 			if (err != nil) != tt.wantError {
-				t.Errorf("ParseNDEFData() error = %v, wantError %v", err, tt.wantError)
+				t.Errorf("ParseNDEFMessage() error = %v, wantError %v", err, tt.wantError)
 				return
 			}
 
@@ -300,7 +300,8 @@ func TestParseNDEFDataSecurity(t *testing.T) {
 					!containsString(errStr, "security violation") &&
 					!containsString(errStr, "invalid NDEF") &&
 					!containsString(errStr, "no NDEF") {
-					t.Errorf("ParseNDEFData() error type mismatch: got %q, expected to contain %q", errStr, expectedStr)
+					t.Errorf("ParseNDEFMessage() error type mismatch: got %q, expected to contain %q",
+						errStr, expectedStr)
 				}
 			}
 		})

ntag.go

@@ -224,7 +224,7 @@ func (t *NTAGTag) ReadNDEF() (*NDEFMessage, error) {
 		data = data[:totalBytes]
 	}
 
-	return ParseNDEFData(data)
+	return ParseNDEFMessage(data)
 }
 
 type ndefHeader struct {
@@ -392,7 +392,7 @@ func (t *NTAGTag) readNDEFBlockByBlock() (*NDEFMessage, error) {
 		}
 	}
 
-	return ParseNDEFData(data)
+	return ParseNDEFMessage(data)
 }
 
 // WriteNDEF writes NDEF data to the NTAG tag

parameter_validation_test.go

@@ -320,11 +320,11 @@ func TestNDEFParameterValidation(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			_, err := ParseNDEFData(tt.data)
+			_, err := ParseNDEFMessage(tt.data)
 			gotError := err != nil
 
 			if gotError != tt.wantError {
-				t.Errorf("ParseNDEFData() error = %v, wantError %v (%s)", err, tt.wantError, tt.desc)
+				t.Errorf("ParseNDEFMessage() error = %v, wantError %v (%s)", err, tt.wantError, tt.desc)
 			}
 		})
 	}