Skip to content

Fix validation of ValidityPeriodFormat #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xlab merged 2 commits into from
Jun 20, 2025
Merged

Fix validation of ValidityPeriodFormat #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b8c236
Add unit test with enhanced TP-VPF PDU
arvo-svg Jun 19, 2025
27741e9
Fix validation of TP-VPF
arvo-svg Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sms/sms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ func (s *Message) decodeSubmit(data []byte) (n int, err error) {
}
s.RejectDuplicates = sms.RejectDuplicates

switch s.VPFormat {
switch ValidityPeriodFormat(sms.ValidityPeriodFormat) {
case ValidityPeriodFormats.Absolute, ValidityPeriodFormats.Enhanced:
return n, ErrNonRelative
default:
Expand Down
19 changes: 19 additions & 0 deletions sms/sms_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ var (

pduDeliverGsm7 = "07919762020033F1040B919762995696F0000041606291401561066379180E8200"
pduSubmitGsm7 = "07919762020033F111000B919762995696F00000AA066379180E8200"
pduSubmitGsm7_EnhancedTpVp = "05915155010009010891515511110000420300000000001e547" +
"47a0e9a36a72074780e9a81e6e5f1db4d9e83e86f103b6d2f03"
pduDeliverGsm7_2 = "0791551010010201040D91551699296568F80011719022124215293DD4B71C5E26BF" +
"41D3E6145476D3E5E573BD0C82BF40B59A2D96CBE564351BCE8603A164319D8CA6ABD540E432482673C172AED82DE502"

Expand Down Expand Up @@ -71,6 +73,13 @@ var (
VP: ValidityPeriod(time.Hour * 24 * 4),
VPFormat: ValidityPeriodFormats.Relative,
}
smsSubmitGsm7_EnhancedTpVp = Message{
Text: "This SMS has 3 seconds to live",
Encoding: Encodings.Gsm7Bit,
Type: MessageTypes.Submit,
Address: "+15551111",
ServiceCenterAddress: "+15551000",
}
smsReport = Message{
Type: MessageTypes.StatusReport,
Status: 0x00, // received
Expand Down Expand Up @@ -176,6 +185,16 @@ func TestSmsSubmitReadFromGsm7(t *testing.T) {
assert.Equal(t, smsSubmitGsm7, msg)
}

func TestSmsSubmitReadFromGsm7_EnhancedTpVp(t *testing.T) {
t.Parallel()

var msg Message
data, err := util.Bytes(pduSubmitGsm7_EnhancedTpVp)
require.NoError(t, err)
_, err = msg.ReadFrom(data)
assert.Equal(t, err, ErrNonRelative)
}

func TestSmsSubmitPduUCS2(t *testing.T) {
t.Parallel()

Expand Down
Loading