refactor more

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

internal/outpost/radius/eap/tls/conn.go

@@ -21,8 +21,16 @@ func NewTLSConnection(initialData []byte) TLSConnection {
 	return c
 }
 
-func (conn TLSConnection) TLSData() []byte {
-	return conn.writer.Bytes()
+func (conn TLSConnection) GetData() []byte {
+	for {
+		b := conn.writer.Bytes()
+		if len(b) < 1 {
+			log.Debug("TLS(buffer): Attempted retrieve from empty buffer, stalling...")
+			time.Sleep(1 * time.Second)
+			continue
+		}
+		return b
+	}
 }
 
 func (conn TLSConnection) UpdateData(data []byte) {

internal/outpost/radius/eap/tls/payload.go

@@ -103,7 +103,7 @@ func (p *Payload) Handle(stt any) (*Payload, State) {
 	if st.HasMore() {
 		return p.sendNextChunk(st)
 	}
-	return p.startChunkedTransfer(st.Conn.TLSData(), st)
+	return p.startChunkedTransfer(st.Conn.GetData(), st)
 }
 
 const maxChunkSize = 1000
@@ -114,10 +114,10 @@ func (p *Payload) startChunkedTransfer(data []byte, st State) (*Payload, State)
 	if len(data) > maxChunkSize {
 		log.WithField("length", len(data)).Debug("TLS: Data needs to be chunked")
 		flags += FlagMoreFragments
-		dataToSend = data[:maxChunkSize]
-		remainingData := data[maxChunkSize:]
-		// Chunk remaining data into correct chunks and add them to the list
-		st.RemainingChunks = append(st.RemainingChunks, slices.Collect(slices.Chunk(remainingData, maxChunkSize))...)
+		// Chunk data into correct chunks and add them to the list
+		st.RemainingChunks = append(st.RemainingChunks, slices.Collect(slices.Chunk(data, maxChunkSize))...)
+		dataToSend = st.RemainingChunks[0]
+		st.RemainingChunks = st.RemainingChunks[1:]
 		st.TotalPayloadSize = len(data)
 	} else {
 		dataToSend = data