Merge pull request #83 from DaniElectra/stationurl-custom-params

fix(types/station_url): Fix invalid checks for custom parameters

prudp_endpoint.go

@@ -509,6 +509,10 @@ func (pep *PRUDPEndPoint) readKerberosTicket(payload []byte) ([]byte, types.PID,
 		return nil, 0, 0, err
 	}
 
+	if userPID != ticket.SourcePID {
+		return nil, 0, 0, errors.New("User PID and ticket source PID mismatch")
+	}
+
 	_, err = checkDataStream.ReadUInt32LE() // * CID of secure server station url
 	if err != nil {
 		return nil, 0, 0, err

prudp_packet_lite.go

@@ -4,6 +4,7 @@ import (
 	"crypto/hmac"
 	"crypto/md5"
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"net"
 
@@ -177,6 +178,10 @@ func (p *PRUDPPacketLite) decode() error {
 		return fmt.Errorf("Failed to decode PRUDPLite options. %s", err.Error())
 	}
 
+	if p.readStream.Remaining() < uint64(payloadLength) {
+		return errors.New("Failed to read PRUDPLite payload. Not have enough data")
+	}
+
 	p.payload = p.readStream.ReadBytesNext(int64(payloadLength))
 
 	return nil
@@ -208,6 +213,10 @@ func (p *PRUDPPacketLite) Bytes() []byte {
 }
 
 func (p *PRUDPPacketLite) decodeOptions() error {
+	if p.readStream.Remaining() < uint64(p.optionsLength) {
+		return errors.New("Not have enough data")
+	}
+
 	data := p.readStream.ReadBytesNext(int64(p.optionsLength))
 	optionsStream := NewByteStreamIn(data, p.server.LibraryVersions, p.server.ByteStreamSettings)
 
@@ -231,8 +240,12 @@ func (p *PRUDPPacketLite) decodeOptions() error {
 			}
 
 			if optionID == 1 {
+				if optionsStream.Remaining() < uint64(optionSize) {
+					err = errors.New("Failed to read connection signature. Not have enough data")
+				} else {
 					p.connectionSignature = optionsStream.ReadBytesNext(int64(optionSize))
 				}
+			}
 
 			if optionID == 4 {
 				p.maximumSubstreamID, err = optionsStream.ReadUInt8()
@@ -253,9 +266,13 @@ func (p *PRUDPPacketLite) decodeOptions() error {
 
 		if p.packetType == constants.ConnectPacket && !p.HasFlag(constants.PacketFlagAck) {
 			if optionID == 0x80 {
+				if optionsStream.Remaining() < uint64(optionSize) {
+					err = errors.New("Failed to read lite signature. Not have enough data")
+				} else {
 					p.liteSignature = optionsStream.ReadBytesNext(int64(optionSize))
 				}
 			}
+		}
 
 		// * Only one option is processed at a time, so we can
 		// * just check for errors here rather than after EVERY

prudp_packet_v1.go

@@ -89,6 +89,10 @@ func (p *PRUDPPacketV1) decode() error {
 		return fmt.Errorf("Failed to decode PRUDPv1 header. %s", err.Error())
 	}
 
+	if p.readStream.Remaining() < 16 {
+		return errors.New("Failed to read PRUDPv1 signature. Not have enough data")
+	}
+
 	p.signature = p.readStream.ReadBytesNext(16)
 
 	err = p.decodeOptions()
@@ -96,6 +100,10 @@ func (p *PRUDPPacketV1) decode() error {
 		return fmt.Errorf("Failed to decode PRUDPv1 options. %s", err.Error())
 	}
 
+	if p.readStream.Remaining() < uint64(p.payloadLength) {
+		return errors.New("Failed to read PRUDPv1 payload. Not have enough data")
+	}
+
 	p.payload = p.readStream.ReadBytesNext(int64(p.payloadLength))
 
 	return nil
@@ -211,6 +219,10 @@ func (p *PRUDPPacketV1) encodeHeader() []byte {
 }
 
 func (p *PRUDPPacketV1) decodeOptions() error {
+	if p.readStream.Remaining() < uint64(p.optionsLength) {
+		return errors.New("Not have enough data")
+	}
+
 	data := p.readStream.ReadBytesNext(int64(p.optionsLength))
 	optionsStream := NewByteStreamIn(data, p.server.LibraryVersions, p.server.ByteStreamSettings)
 
@@ -234,8 +246,12 @@ func (p *PRUDPPacketV1) decodeOptions() error {
 			}
 
 			if optionID == 1 {
+				if optionsStream.Remaining() < 16 {
+					err = errors.New("Not have enough data")
+				} else {
 					p.connectionSignature = optionsStream.ReadBytesNext(16)
 				}
+			}
 
 			if optionID == 4 {
 				p.maximumSubstreamID, err = optionsStream.ReadUInt8()

prudp_server.go

@@ -127,6 +127,11 @@ func (ps *PRUDPServer) initPRUDPv1ConnectionSignatureKey() {
 }
 
 func (ps *PRUDPServer) handleSocketMessage(packetData []byte, address net.Addr, webSocketConnection *gws.Conn) error {
+	// * Check that the message is long enough for initial parsing
+	if len(packetData) < 2 {
+		return nil
+	}
+
 	readStream := NewByteStreamIn(packetData, ps.LibraryVersions, ps.ByteStreamSettings)
 
 	var packets []PRUDPPacketInterface

types/datetime.go

@@ -63,7 +63,7 @@ func (dt *DateTime) Make(year, month, day, hour, minute, second int) DateTime {
 }
 
 // FromTimestamp converts a Time timestamp into a NEX DateTime
-func (dt DateTime) FromTimestamp(timestamp time.Time) DateTime {
+func (dt *DateTime) FromTimestamp(timestamp time.Time) DateTime {
 	year := timestamp.Year()
 	month := int(timestamp.Month())
 	day := timestamp.Day()

types/station_url.go

@@ -643,7 +643,7 @@ func (s *StationURL) Parse() {
 
 	standardParameters := strings.Split(standardSection, ";")
 
-	for i := 0; i < len(standardParameters); i++ {
+	for i := range standardParameters {
 		key, value, _ := strings.Cut(standardParameters[i], "=")
 
 		if key == "address" && len(value) > 256 {
@@ -662,13 +662,15 @@ func (s *StationURL) Parse() {
 		s.Set(key, value, false)
 	}
 
+	if len(customSection) != 0 {
 		customParameters := strings.Split(customSection, ";")
 
-	for i := 0; i < len(customParameters); i++ {
+		for i := range customParameters {
 			key, value, _ := strings.Cut(customParameters[i], "=")
 
 			s.Set(key, value, true)
 		}
+	}
 
 	if flags, ok := s.uint8ParamValue("type"); ok {
 		s.flags = flags
@@ -691,15 +693,6 @@ func (s *StationURL) Format() {
 
 	fields := make([]string, 0)
 
-	for key, value := range s.standardParams {
-		fields = append(fields, fmt.Sprintf("%s=%s", key, value))
-	}
-
-	url := scheme + strings.Join(fields, ";")
-
-	if len(s.customParams) != 0 {
-		customFields := make([]string, 0)
-
 	for key, value := range s.standardParams {
 		if key == "address" && len(value) > 256 {
 			// * The client can only hold a host name of up to 256 characters
@@ -714,6 +707,15 @@ func (s *StationURL) Format() {
 			}
 		}
 
+		fields = append(fields, fmt.Sprintf("%s=%s", key, value))
+	}
+
+	url := scheme + strings.Join(fields, ";")
+
+	if len(s.customParams) != 0 {
+		customFields := make([]string, 0)
+
+		for key, value := range s.customParams {
 			customFields = append(customFields, fmt.Sprintf("%s=%s", key, value))
 		}