Merge pull request #47 from enowars/clean-up

Some clean up, remove unused features
enowars · Jul 18, 2023 · 7b32e88 · 7b32e88
2 parents 74fcaf2 + 332142f
commit 7b32e88
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 235 deletions.
diff --git a/checker/requirements.txt b/checker/requirements.txt
diff --git a/checker/src/internal/handler/handler.go b/checker/src/internal/handler/handler.go
@@ -465,8 +465,8 @@ func (h *Handler) checkNullEncCore(ctx context.Context, message *enochecker.Task
 		return err
 	}
 
-	regMsg := nas.NASRegRequestMsg{SecHeader: 0,
-		MobileId: nas.MobileIdType{Mcc: 0, Mnc: 0, ProtecScheme: 0, HomeNetPki: 0, Msin: 0},
+	regMsg := nas.NASRegRequestMsg{
+		MobileId: nas.MobileIdType{Mcc: 0, Mnc: 0, HomeNetPki: 0, Msin: 0},
 		SecCap:   nas.SecCapType{EaCap: nas.EA0, IaCap: nas.IA1},
 	}
 
@@ -511,7 +511,7 @@ func (h *Handler) checkNullEncCore(ctx context.Context, message *enochecker.Task
 	}
 
 	res := crypto.IA2(authReq.Rand, key)
-	authRes := nas.NASAuthResponseMsg{SecHeader: 0, Res: res}
+	authRes := nas.NASAuthResponseMsg{Res: res}
 	authResMsg, mac, err := nas.BuildMessagePlain(&authRes)
 	if err != nil {
 		return err
@@ -677,7 +677,7 @@ func (h *Handler) checkNullEncUE(ctx context.Context, message *enochecker.TaskMe
 
 	auth := crypto.IA2(authRand, key)
 
-	authReq := nas.NASAuthRequestMsg{SecHeader: 0, Rand: randToken, AuthRand: authRand, Auth: auth}
+	authReq := nas.NASAuthRequestMsg{Rand: randToken, AuthRand: authRand, Auth: auth}
 
 	authReqbuf, mac, err := nas.BuildMessagePlain(&authReq)
 	if err != nil {
@@ -698,10 +698,10 @@ func (h *Handler) checkNullEncUE(ctx context.Context, message *enochecker.TaskMe
 		ia = 1
 	}
 
-	secModeCmd := nas.NASSecurityModeCommandMsg{SecHeader: 1, EaAlg: 0,
+	secModeCmd := nas.NASSecurityModeCommandMsg{EaAlg: 0,
 		IaAlg: 1, ReplaySecCap: sec,
 	}
-	secModeMsg, mac, err := nas.BuildMessagePlain(&secModeCmd)
+	secModeMsg, mac, err := nas.BuildMessage(0, 1, &secModeCmd, key)
 	if err != nil {
 		return err
 	}

diff --git a/checker/src/internal/nas/msgTypes.go b/checker/src/internal/nas/msgTypes.go
@@ -99,34 +99,29 @@ type MobileIdType struct {
 	Mcc uint8
 	Mnc uint8
 	// Routing indicator
-	ProtecScheme uint8
-	HomeNetPki   uint8
-	Msin         uint
+	HomeNetPki uint8
+	Msin       uint
 }
 
 type NASRegRequestMsg struct {
 	// Extended protocol discriminator
-	SecHeader uint8
 	// 5GS registration type
 	// ngKsi
 	MobileId MobileIdType
 	SecCap   SecCapType
 }
 
 type NASAuthRequestMsg struct {
-	SecHeader uint8
-	Rand      []byte
-	AuthRand  []byte
-	Auth      []byte
+	Rand     []byte
+	AuthRand []byte
+	Auth     []byte
 }
 
 type NASAuthResponseMsg struct {
-	SecHeader uint8
-	Res       []byte
+	Res []byte
 }
 
 type NASSecurityModeCommandMsg struct {
-	SecHeader    uint8
 	EaAlg        uint8
 	IaAlg        uint8
 	ReplaySecCap SecCapType
@@ -135,7 +130,6 @@ type NASSecurityModeCommandMsg struct {
 type PDUSessionEstRequestMsg struct {
 	PduSesId   uint8
 	PduSesType uint8
-	// add integrity protetion maximum data rate
 }
 
 type PDUSessionEstAcceptMsg struct {

diff --git a/checker/tester.py b/checker/tester.py
diff --git a/service/.service-secrets.env b/service/.service-secrets.env
diff --git a/service/gnb b/service/gnb
diff --git a/service/src/cmd/ue/main.go b/service/src/cmd/ue/main.go
@@ -31,7 +31,7 @@ func handleConnection(logger *zap.Logger, c net.Conn) {
 
 	u := *ue.NewUE(logger)
 
-	err := sendRegistrationRequest(u, c)
+	err := sendRegistrationRequest(&u, c)
 	if err != nil {
 		log.Error(err)
 		return
@@ -115,11 +115,13 @@ func handleConnection(logger *zap.Logger, c net.Conn) {
 
 }
 
-func sendRegistrationRequest(u ue.UE, c net.Conn) error {
-	regMsg := nas.NASRegRequestMsg{SecHeader: 0,
-		MobileId: nas.MobileIdType{Mcc: 0, Mnc: 0, ProtecScheme: 0, HomeNetPki: 0, Msin: 0},
-		SecCap:   nas.SecCapType{EaCap: nas.EA1, IaCap: nas.IA1 ^ nas.IA2 ^ nas.IA3 ^ nas.IA4},
+func sendRegistrationRequest(u *ue.UE, c net.Conn) error {
+	sec := nas.SecCapType{EaCap: nas.EA1, IaCap: nas.IA1 ^ nas.IA2 ^ nas.IA3 ^ nas.IA4}
+	regMsg := nas.NASRegRequestMsg{
+		MobileId: nas.MobileIdType{Mcc: 0, Mnc: 0, HomeNetPki: 0, Msin: 0},
+		SecCap:   sec,
 	}
+	u.SecCap = sec
 
 	msg, err := parser.EncodeMsg(&regMsg)
 	if err != nil {

diff --git a/service/src/internal/core/builder.go b/service/src/internal/core/builder.go
diff --git a/service/src/internal/core/handler.go b/service/src/internal/core/handler.go
@@ -333,7 +333,7 @@ func (amf *Amf) handleInitUEMessage(c net.Conn, buf []byte, amfg *AmfGNB) error
 
 	ue.RandToken = randToken
 
-	authReq := nas.NASAuthRequestMsg{SecHeader: 0, Rand: ue.RandToken, AuthRand: authRand, Auth: auth}
+	authReq := nas.NASAuthRequestMsg{Rand: ue.RandToken, AuthRand: authRand, Auth: auth}
 
 	authReqbuf, mac, err := nas.BuildMessagePlain(&authReq)
 	if err != nil {
@@ -390,7 +390,7 @@ func (amf *Amf) handleNASAuthResponse(c net.Conn, buf []byte, amfg *AmfGNB, ue *
 
 	ue.EaAlg = EA
 	ue.IaAlg = IA
-	secModeCmd := nas.NASSecurityModeCommandMsg{SecHeader: 1, EaAlg: ue.EaAlg,
+	secModeCmd := nas.NASSecurityModeCommandMsg{EaAlg: ue.EaAlg,
 		IaAlg: ue.IaAlg, ReplaySecCap: ue.SecCap,
 	}
 	secModeMsg, mac, err := nas.BuildMessagePlain(&secModeCmd)

diff --git a/service/src/internal/core/handler_test.go b/service/src/internal/core/handler_test.go
diff --git a/service/src/internal/ue/builder.go b/service/src/internal/ue/builder.go
diff --git a/service/src/internal/ue/handler.go b/service/src/internal/ue/handler.go
@@ -1,11 +1,9 @@
 package ue
 
 import (
-	"bufio"
 	"bytes"
 	"errors"
 	"net"
-	"os"
 	"phreaking/internal/crypto"
 	"phreaking/internal/io"
 	"phreaking/pkg/nas"
@@ -59,19 +57,10 @@ func (u *UE) HandleNASSecurityModeCommand(c net.Conn, msgbuf []byte) error {
 	u.EaAlg = msg.EaAlg
 	u.IaAlg = msg.IaAlg
 
-	location := ""
-	readFile, err := os.Open("/service/data/location.data")
+	location, err := u.GetLocation()
 	if err != nil {
 		return err
 	}
-
-	fileScanner := bufio.NewScanner(readFile)
-	fileScanner.Split(bufio.ScanLines)
-	for fileScanner.Scan() {
-		location = fileScanner.Text()
-	}
-	readFile.Close()
-
 	loc := nas.LocationUpdateMsg{Location: location}
 	locMsg, mac, err := nas.BuildMessage(u.EaAlg, u.IaAlg, &loc)
 	if err != nil {
@@ -106,7 +95,7 @@ func (u *UE) HandleNASAuthRequest(c net.Conn, msgbuf []byte) error {
 	}
 
 	res := crypto.IA2(msg.Rand)
-	authRes := nas.NASAuthResponseMsg{SecHeader: 0, Res: res}
+	authRes := nas.NASAuthResponseMsg{Res: res}
 	authResMsg, mac, err := nas.BuildMessagePlain(&authRes)
 	if err != nil {
 		return err

diff --git a/service/src/internal/ue/ue.go b/service/src/internal/ue/ue.go
@@ -1,14 +1,18 @@
 package ue
 
 import (
+	"bufio"
+	"os"
+	"phreaking/pkg/nas"
+
 	"go.uber.org/zap"
 )
 
 type UE struct {
 	Logger *zap.Logger
 	state  StateType
 	//MobileId ngap.MobileIdType
-	//SecCap   ngap.SecCapType
+	SecCap      nas.SecCapType
 	EaAlg       uint8
 	IaAlg       uint8
 	ActivePduId uint8
@@ -31,6 +35,23 @@ func (u *UE) InState(s StateType) bool {
 	return (u.state == s)
 }
 
+func (u *UE) GetLocation() (string, error) {
+	u.Logger.Sugar().Debugf("Getting location from UE OS API")
+	location := ""
+	readFile, err := os.Open("/service/data/location.data")
+	if err != nil {
+		return location, err
+	}
+
+	fileScanner := bufio.NewScanner(readFile)
+	fileScanner.Split(bufio.ScanLines)
+	for fileScanner.Scan() {
+		location = fileScanner.Text()
+	}
+	readFile.Close()
+	return location, nil
+}
+
 type StateType string
 
 // state for UE