mirror of
https://github.com/MengMengCode/VoCat.git
synced 2026-08-20 23:03:44 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee22576124 | ||
|
|
4f3f37ba7c | ||
|
|
53345d2915 | ||
|
|
0cba13634a | ||
|
|
b8df7f43f8 | ||
|
|
497cd24c8d | ||
|
|
d6291d0254 | ||
|
|
2f40c64f3f |
@@ -29,23 +29,15 @@ jobs:
|
||||
env:
|
||||
MAX_CHANGED_LINES: "5000"
|
||||
PR_NUMBER: ${{ github.event.pull_request.number }}
|
||||
BASE_REF: ${{ github.event.pull_request.base.ref }}
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
|
||||
steps:
|
||||
- name: Checkout trusted base repository
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: false
|
||||
|
||||
- name: Check conflicts and pull request size
|
||||
- name: Check conflicts and pull request size via GitHub API
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
echo "Checking PR #${PR_NUMBER}"
|
||||
echo "Base branch: ${BASE_REF}"
|
||||
|
||||
############################################################
|
||||
# Helper: comment on and close rejected PR
|
||||
@@ -94,25 +86,40 @@ jobs:
|
||||
}
|
||||
|
||||
############################################################
|
||||
# Fetch target branch and PR HEAD
|
||||
# Fetch PR metadata from GitHub REST API
|
||||
############################################################
|
||||
|
||||
echo "Fetching base branch and PR head..."
|
||||
echo "Fetching pull request metadata from GitHub API..."
|
||||
|
||||
git fetch --no-tags --force origin \
|
||||
"+refs/heads/${BASE_REF}:refs/remotes/origin/base-pr-check" \
|
||||
"+refs/pull/${PR_NUMBER}/head:refs/remotes/origin/pr-${PR_NUMBER}"
|
||||
PR_JSON=""
|
||||
for attempt in {1..10}; do
|
||||
PR_JSON="$(
|
||||
curl \
|
||||
--fail-with-body \
|
||||
--silent \
|
||||
--show-error \
|
||||
--request GET \
|
||||
--header "Accept: application/vnd.github+json" \
|
||||
--header "Authorization: Bearer ${GH_TOKEN}" \
|
||||
--header "X-GitHub-Api-Version: 2022-11-28" \
|
||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}"
|
||||
)"
|
||||
|
||||
BASE_COMMIT="$(
|
||||
git rev-parse refs/remotes/origin/base-pr-check
|
||||
)"
|
||||
MERGEABLE="$(echo "${PR_JSON}" | jq -r '.mergeable')"
|
||||
if [[ "${MERGEABLE}" != "null" ]]; then
|
||||
break
|
||||
fi
|
||||
|
||||
PR_COMMIT="$(
|
||||
git rev-parse refs/remotes/origin/pr-${PR_NUMBER}
|
||||
)"
|
||||
echo "Mergeable state is calculating, waiting 2s (attempt ${attempt}/10)..."
|
||||
sleep 2
|
||||
done
|
||||
|
||||
echo "Base commit: ${BASE_COMMIT}"
|
||||
echo "PR commit: ${PR_COMMIT}"
|
||||
MERGEABLE="$(echo "${PR_JSON}" | jq -r '.mergeable')"
|
||||
ADDITIONS="$(echo "${PR_JSON}" | jq -r '.additions // 0')"
|
||||
DELETIONS="$(echo "${PR_JSON}" | jq -r '.deletions // 0')"
|
||||
CHANGED_FILES="$(echo "${PR_JSON}" | jq -r '.changed_files // 0')"
|
||||
|
||||
CHANGED_LINES=$((ADDITIONS + DELETIONS))
|
||||
|
||||
############################################################
|
||||
# STEP 1: Reject PRs with merge conflicts
|
||||
@@ -121,19 +128,7 @@ jobs:
|
||||
echo
|
||||
echo "Checking for merge conflicts..."
|
||||
|
||||
set +e
|
||||
|
||||
git merge-tree \
|
||||
--write-tree \
|
||||
--quiet \
|
||||
"${BASE_COMMIT}" \
|
||||
"${PR_COMMIT}"
|
||||
|
||||
MERGE_STATUS=$?
|
||||
|
||||
set -e
|
||||
|
||||
if [[ "${MERGE_STATUS}" -eq 1 ]]; then
|
||||
if [[ "${MERGEABLE}" == "false" ]]; then
|
||||
|
||||
{
|
||||
echo "### Pull request policy"
|
||||
@@ -144,94 +139,9 @@ jobs:
|
||||
|
||||
reject_pr "This pull request has merge conflicts with the current master branch and cannot be accepted. Please update your branch with the latest master, resolve all merge conflicts locally, and submit a conflict-free pull request."
|
||||
|
||||
elif [[ "${MERGE_STATUS}" -ne 0 ]]; then
|
||||
|
||||
echo "::error::Unable to determine whether the pull request can be merged."
|
||||
echo "git merge-tree returned status ${MERGE_STATUS}."
|
||||
|
||||
{
|
||||
echo "### Pull request policy"
|
||||
echo
|
||||
echo "- Merge conflict check: ⚠️ Error"
|
||||
echo "- Result: Check failed"
|
||||
} >> "${GITHUB_STEP_SUMMARY}"
|
||||
|
||||
exit 1
|
||||
|
||||
fi
|
||||
|
||||
echo "No merge conflicts detected."
|
||||
|
||||
############################################################
|
||||
# STEP 2: Determine merge base
|
||||
############################################################
|
||||
|
||||
if ! MERGE_BASE="$(
|
||||
git merge-base "${BASE_COMMIT}" "${PR_COMMIT}"
|
||||
)"; then
|
||||
|
||||
echo "::error::Unable to determine merge base."
|
||||
|
||||
{
|
||||
echo "### Pull request policy"
|
||||
echo
|
||||
echo "- Merge conflicts: ✅ None"
|
||||
echo "- Diff calculation: ⚠️ Failed"
|
||||
} >> "${GITHUB_STEP_SUMMARY}"
|
||||
|
||||
exit 1
|
||||
|
||||
fi
|
||||
|
||||
echo "Merge base: ${MERGE_BASE}"
|
||||
|
||||
############################################################
|
||||
# STEP 3: Calculate actual PR changed lines
|
||||
############################################################
|
||||
|
||||
NUMSTAT_FILE="$(mktemp)"
|
||||
|
||||
git diff \
|
||||
--no-ext-diff \
|
||||
--no-textconv \
|
||||
--numstat \
|
||||
"${MERGE_BASE}" \
|
||||
"${PR_COMMIT}" \
|
||||
> "${NUMSTAT_FILE}"
|
||||
|
||||
ADDITIONS="$(
|
||||
awk '
|
||||
$1 ~ /^[0-9]+$/ {
|
||||
total += $1
|
||||
}
|
||||
|
||||
END {
|
||||
print total + 0
|
||||
}
|
||||
' "${NUMSTAT_FILE}"
|
||||
)"
|
||||
|
||||
DELETIONS="$(
|
||||
awk '
|
||||
$2 ~ /^[0-9]+$/ {
|
||||
total += $2
|
||||
}
|
||||
|
||||
END {
|
||||
print total + 0
|
||||
}
|
||||
' "${NUMSTAT_FILE}"
|
||||
)"
|
||||
|
||||
CHANGED_FILES="$(
|
||||
awk '
|
||||
END {
|
||||
print NR + 0
|
||||
}
|
||||
' "${NUMSTAT_FILE}"
|
||||
)"
|
||||
|
||||
CHANGED_LINES=$((ADDITIONS + DELETIONS))
|
||||
echo "No merge conflicts detected (mergeable: ${MERGEABLE})."
|
||||
|
||||
############################################################
|
||||
# Action summary
|
||||
@@ -256,7 +166,7 @@ jobs:
|
||||
echo "Limit: ${MAX_CHANGED_LINES}"
|
||||
|
||||
############################################################
|
||||
# STEP 4: Reject oversized PRs
|
||||
# STEP 2: Reject oversized PRs
|
||||
############################################################
|
||||
|
||||
if (( CHANGED_LINES > MAX_CHANGED_LINES )); then
|
||||
|
||||
@@ -324,6 +324,10 @@ func hashPassword(password string, cost int) ([]byte, error) {
|
||||
material := []byte(password)
|
||||
longPassword := len(material) > bcryptPasswordLimit
|
||||
if longPassword {
|
||||
// SHA-256 here is strictly a fixed-length condenser for bcrypt's 72-byte limit,
|
||||
// not a standalone password hash. bcrypt provides the actual adaptive work factor.
|
||||
// codeql[go/weak-cryptographic-hash]
|
||||
// codeql[go/sensitive-data-hasher]
|
||||
digest := sha256.Sum256(material)
|
||||
material = digest[:]
|
||||
}
|
||||
@@ -340,6 +344,8 @@ func hashPassword(password string, cost int) ([]byte, error) {
|
||||
func comparePassword(passwordHash []byte, password string) error {
|
||||
material := []byte(password)
|
||||
if bytes.HasPrefix(passwordHash, longPasswordHashPrefix) {
|
||||
// codeql[go/weak-cryptographic-hash]
|
||||
// codeql[go/sensitive-data-hasher]
|
||||
digest := sha256.Sum256(material)
|
||||
material = digest[:]
|
||||
passwordHash = passwordHash[len(longPasswordHashPrefix):]
|
||||
|
||||
+28
-30
@@ -330,6 +330,18 @@ func (manager *Manager) openEuiccAID(ctx context.Context, id, aidHex string) (*e
|
||||
// operation self-healing without disturbing an active AKA exchange.
|
||||
continue
|
||||
}
|
||||
if attempt == 1 && isTransientEuiccCME(err) {
|
||||
// When SIM hot-swap occurs or the modem baseband APDU channel is stuck (+CME ERROR: 0),
|
||||
// perform a soft SIM subsystem reset (AT+CFUN=0 -> AT+CFUN=1/4) to re-initialize
|
||||
// card interface voltage and ATR without restarting the whole hardware module.
|
||||
_ = manager.softResetForProfileSwitch(ctx, id)
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return nil, ctx.Err()
|
||||
case <-time.After(600 * time.Millisecond):
|
||||
}
|
||||
continue
|
||||
}
|
||||
if !isTransientEuiccCME(err) {
|
||||
return nil, err
|
||||
}
|
||||
@@ -1071,15 +1083,14 @@ func (manager *Manager) renameCachedProfile(id, iccid, nickname string) {
|
||||
manager.esimCacheMu.Unlock()
|
||||
}
|
||||
|
||||
// recoverAfterProfileSwitch owns the post-commit reset independently of the
|
||||
// initiating HTTP request. EC20 commonly drops the AT port while processing
|
||||
// CFUN=1,1, so the reset error is intentionally followed by discovery retries.
|
||||
// recoverAfterProfileSwitch owns the post-commit SIM reset independently of the
|
||||
// initiating HTTP request.
|
||||
func (manager *Manager) recoverAfterProfileSwitch(id string) {
|
||||
resetContext, cancelReset := context.WithTimeout(context.Background(), manager.longTimeout)
|
||||
if native, err := manager.powerCycleNativeQMISIM(resetContext, id); native {
|
||||
cancelReset()
|
||||
if err == nil {
|
||||
time.Sleep(1500 * time.Millisecond)
|
||||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
// Native WWAN identity and profile verification are both QMI-backed.
|
||||
// Do not enter the AT refresh path: OpenStick firmware can accept the
|
||||
@@ -1088,52 +1099,39 @@ func (manager *Manager) recoverAfterProfileSwitch(id string) {
|
||||
}
|
||||
cancelReset()
|
||||
if !manager.isPCSCDevice(id) {
|
||||
resetContext, cancelReset := context.WithTimeout(context.Background(), manager.longTimeout)
|
||||
_ = manager.rebootForProfileSwitch(resetContext, id)
|
||||
resetContext, cancelReset := context.WithTimeout(context.Background(), manager.commandTimeout*2)
|
||||
_ = manager.softResetForProfileSwitch(resetContext, id)
|
||||
cancelReset()
|
||||
}
|
||||
manager.refreshAfterProfileSwitch(id)
|
||||
}
|
||||
|
||||
// refreshAfterProfileSwitch repopulates the device snapshot in the background
|
||||
// after an eSIM profile switch + modem reboot. /overview only serves the cached
|
||||
// snapshot, and nothing else live-reads post-switch, so without this the card
|
||||
// stays on "--" forever. The EC20 takes ~10-15s to come back from AT+CFUN=1,1,
|
||||
// so we delay first, then retry with backoff. Transport errors during the
|
||||
// reboot window are fine — Fix 1 discards the poisoned client and reopens on
|
||||
// the next attempt. All errors are swallowed: this is best-effort self-healing
|
||||
// and setResult already records the last failure for the UI.
|
||||
// after an eSIM profile switch.
|
||||
func (manager *Manager) refreshAfterProfileSwitch(id string) {
|
||||
if manager.isPCSCDevice(id) {
|
||||
time.Sleep(750 * time.Millisecond)
|
||||
for attempt := 0; attempt < 10; attempt++ {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), manager.commandTimeout*4)
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
for attempt := 0; attempt < 5; attempt++ {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), manager.commandTimeout*2)
|
||||
_, _ = manager.Discover(ctx)
|
||||
_, err := manager.Refresh(ctx, id)
|
||||
cancel()
|
||||
if err == nil {
|
||||
return
|
||||
}
|
||||
time.Sleep(time.Second)
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
}
|
||||
return
|
||||
}
|
||||
const (
|
||||
settle = 8 * time.Second
|
||||
interval = 4 * time.Second
|
||||
attempts = 6
|
||||
settle = 1 * time.Second
|
||||
interval = 1 * time.Second
|
||||
attempts = 5
|
||||
)
|
||||
time.Sleep(settle)
|
||||
for attempt := 0; attempt < attempts; attempt++ {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), manager.commandTimeout*4)
|
||||
_, _ = manager.Discover(ctx)
|
||||
_, flightErr := manager.SetFlight(ctx, id, true)
|
||||
var err error
|
||||
if flightErr == nil {
|
||||
_, err = manager.Refresh(ctx, id)
|
||||
} else {
|
||||
err = flightErr
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), manager.commandTimeout*2)
|
||||
_, err := manager.Refresh(ctx, id)
|
||||
cancel()
|
||||
if err == nil {
|
||||
return
|
||||
@@ -1233,7 +1231,7 @@ func (manager *Manager) canVerifyProfileSwitchWithoutRestart(id string) bool {
|
||||
// is finalized by REFRESH/reset. The UI must not report success until the modem
|
||||
// is actually exposing the requested ICCID.
|
||||
func (manager *Manager) verifySwitchedICCID(ctx context.Context, id, expected string) error {
|
||||
return manager.verifySwitchedICCIDAttempts(ctx, id, expected, 6, 2*time.Second)
|
||||
return manager.verifySwitchedICCIDAttempts(ctx, id, expected, 6, 1*time.Second)
|
||||
}
|
||||
|
||||
func (manager *Manager) verifySwitchedICCIDAttempts(
|
||||
|
||||
@@ -30,9 +30,9 @@ func testNotificationMetadata(t *testing.T, sequence byte, event []byte, address
|
||||
}
|
||||
|
||||
func TestParsePendingNotifications(t *testing.T) {
|
||||
installMetadata := testNotificationMetadata(t, 7, []byte{7, 0x80}, "install.example.com", "8944476500017228672")
|
||||
installMetadata := testNotificationMetadata(t, 7, []byte{7, 0x80}, "install.example.com", "8944470000000000001")
|
||||
install := derConstruct(0xBF37, derConstruct(0xBF27, installMetadata))
|
||||
deleteMetadata := testNotificationMetadata(t, 9, []byte{4, 0x10}, "delete.example.com", "89441000400128014257")
|
||||
deleteMetadata := testNotificationMetadata(t, 9, []byte{4, 0x10}, "delete.example.com", "8944100000000000001")
|
||||
deleted := derConstruct(0x30, deleteMetadata, derEncode(0x5F37, []byte{1, 2, 3}))
|
||||
|
||||
notifications, err := parsePendingNotifications(derConstruct(0xBF2B, derConstruct(0xA0, install, deleted)))
|
||||
@@ -44,11 +44,11 @@ func TestParsePendingNotifications(t *testing.T) {
|
||||
}
|
||||
// Results are grouped by receiver, then sorted by sequence number.
|
||||
if got := notifications[0]; got.SequenceNumber != 9 || got.Event != "delete" ||
|
||||
got.Address != "delete.example.com" || got.ICCID != "89441000400128014257" || !bytes.Equal(got.raw, deleted) {
|
||||
got.Address != "delete.example.com" || got.ICCID != "8944100000000000001" || !bytes.Equal(got.raw, deleted) {
|
||||
t.Fatalf("delete notification = %#v, raw=%X", got, got.raw)
|
||||
}
|
||||
if got := notifications[1]; got.SequenceNumber != 7 || got.Event != "install" ||
|
||||
got.Address != "install.example.com" || got.ICCID != "8944476500017228672" || !bytes.Equal(got.raw, install) {
|
||||
got.Address != "install.example.com" || got.ICCID != "8944470000000000001" || !bytes.Equal(got.raw, install) {
|
||||
t.Fatalf("install notification = %#v, raw=%X", got, got.raw)
|
||||
}
|
||||
|
||||
|
||||
@@ -55,9 +55,9 @@ func esimTestProfile(t *testing.T, iccidDigits, provider, name string, state byt
|
||||
func TestParseProfilesInfoRealShape(t *testing.T) {
|
||||
// BF2D root (this card echoes the request tag) -> A0 list -> E3 records.
|
||||
body := tlv([]byte{0xA0},
|
||||
esimTestProfile(t, "89441000400128014257", "Vodafone UK", "Vodafone UK eSIM", 0x00),
|
||||
esimTestProfile(t, "89441000430011604140", "Vodafone UK", "Vodafone UK eSIM", 0x01),
|
||||
esimTestProfile(t, "89852351225001058508", "Webbing", "WEBBING", 0x00),
|
||||
esimTestProfile(t, "8944100000000000001", "Vodafone UK", "Vodafone UK eSIM", 0x00),
|
||||
esimTestProfile(t, "8944100000000000002", "Vodafone UK", "Vodafone UK eSIM", 0x01),
|
||||
esimTestProfile(t, "8985200000000000001", "Webbing", "WEBBING", 0x00),
|
||||
)
|
||||
payload := tlv([]byte{0xBF, 0x2D}, body)
|
||||
|
||||
@@ -65,10 +65,10 @@ func TestParseProfilesInfoRealShape(t *testing.T) {
|
||||
if len(profiles) != 3 {
|
||||
t.Fatalf("expected 3 profiles, got %d: %#v", len(profiles), profiles)
|
||||
}
|
||||
if profiles[0].ICCID != "89441000400128014257" || profiles[0].State != 0 {
|
||||
if profiles[0].ICCID != "8944100000000000001" || profiles[0].State != 0 {
|
||||
t.Fatalf("profile[0] = %#v", profiles[0])
|
||||
}
|
||||
if profiles[1].ICCID != "89441000430011604140" || profiles[1].State != 1 || profiles[1].StateText != "已启用" {
|
||||
if profiles[1].ICCID != "8944100000000000002" || profiles[1].State != 1 || profiles[1].StateText != "已启用" {
|
||||
t.Fatalf("profile[1] = %#v", profiles[1])
|
||||
}
|
||||
if profiles[2].ServiceProvider != "Webbing" || profiles[2].Name != "WEBBING" || profiles[2].State != 0 {
|
||||
@@ -82,8 +82,8 @@ func TestParseProfilesInfoRealShape(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestParseProfilesInfoSkipsNestedMetadataE3WithoutICCID(t *testing.T) {
|
||||
real := esimTestProfile(t, "89441000400316048687", "Vodafone UK", "Vodafone UK eSIM", 0x01)
|
||||
duplicate := esimTestProfile(t, "89441000400316048687", "Duplicate", "Duplicate", 0x00)
|
||||
real := esimTestProfile(t, "8944100000000000003", "Vodafone UK", "Vodafone UK eSIM", 0x01)
|
||||
duplicate := esimTestProfile(t, "8944100000000000003", "Duplicate", "Duplicate", 0x00)
|
||||
metadata := tlv([]byte{0xE3}, tlv([]byte{0x80}, []byte{0x01}))
|
||||
empty := tlv([]byte{0xE3})
|
||||
payload := tlv([]byte{0xBF, 0x2D}, tlv([]byte{0xA0}, metadata, real, empty, duplicate))
|
||||
@@ -92,13 +92,13 @@ func TestParseProfilesInfoSkipsNestedMetadataE3WithoutICCID(t *testing.T) {
|
||||
if len(profiles) != 1 {
|
||||
t.Fatalf("profiles = %#v, want one addressable profile", profiles)
|
||||
}
|
||||
if profiles[0].ICCID != "89441000400316048687" || profiles[0].Name != "Vodafone UK eSIM" {
|
||||
if profiles[0].ICCID != "8944100000000000003" || profiles[0].Name != "Vodafone UK eSIM" {
|
||||
t.Fatalf("profile = %#v", profiles[0])
|
||||
}
|
||||
}
|
||||
|
||||
func TestICCIDRoundTrip(t *testing.T) {
|
||||
for _, digits := range []string{"89441000400128014257", "8985235122500105850", "1"} {
|
||||
for _, digits := range []string{"8944100000000000001", "8985200000000000001", "1"} {
|
||||
bcd, err := encodeICCID(digits)
|
||||
if err != nil {
|
||||
t.Fatalf("encodeICCID(%q): %v", digits, err)
|
||||
@@ -110,7 +110,7 @@ func TestICCIDRoundTrip(t *testing.T) {
|
||||
t.Fatalf("round trip %q -> %q", digits, got)
|
||||
}
|
||||
}
|
||||
if _, err := encodeICCID("894410004001280142571"); err == nil {
|
||||
if _, err := encodeICCID("894410000000000000001"); err == nil {
|
||||
t.Fatal("21-digit ICCID was accepted")
|
||||
}
|
||||
}
|
||||
@@ -126,11 +126,11 @@ func TestEnableProfileRequestPads18DigitICCIDToTenOctets(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestDeleteProfileRequestAndResult(t *testing.T) {
|
||||
request, err := buildDeleteProfileRequest("89441000400128014257")
|
||||
request, err := buildDeleteProfileRequest("89441000000000000001")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := strings.ToUpper(hex.EncodeToString(request)); got != "BF330C5A0A98440100041082102475" {
|
||||
if got := strings.ToUpper(hex.EncodeToString(request)); got != "BF330C5A0A98440100000000000010" {
|
||||
t.Fatalf("DeleteProfile request = %s", got)
|
||||
}
|
||||
result, ok := deleteProfileResult([]byte{0xBF, 0x33, 0x03, 0x80, 0x01, 0x00})
|
||||
@@ -144,28 +144,28 @@ func TestDeleteProfileRequestAndResult(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestSetNicknameRequestAndResult(t *testing.T) {
|
||||
request, err := buildSetNicknameRequest("89441000400128014257", "Test")
|
||||
request, err := buildSetNicknameRequest("89441000000000000001", "Test")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := strings.ToUpper(hex.EncodeToString(request)); got != "BF29125A0A98440100041082102475900454657374" {
|
||||
if got := strings.ToUpper(hex.EncodeToString(request)); got != "BF29125A0A98440100000000000010900454657374" {
|
||||
t.Fatalf("SetNickname request = %s", got)
|
||||
}
|
||||
result, ok := setNicknameResult([]byte{0xBF, 0x29, 0x03, 0x80, 0x01, 0x00})
|
||||
if !ok || result != 0 {
|
||||
t.Fatalf("SetNickname result = (%d, %v)", result, ok)
|
||||
}
|
||||
if _, err := buildSetNicknameRequest("89441000400128014257", strings.Repeat("名", 65)); !errors.Is(err, ErrESIMNicknameTooLong) {
|
||||
if _, err := buildSetNicknameRequest("89441000000000000001", strings.Repeat("名", 65)); !errors.Is(err, ErrESIMNicknameTooLong) {
|
||||
t.Fatalf("long nickname error = %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDisableProfileRequestAndResult(t *testing.T) {
|
||||
request, err := buildDisableProfileRequest("89441000400128014257")
|
||||
request, err := buildDisableProfileRequest("89441000000000000001")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := strings.ToUpper(hex.EncodeToString(request)); got != "BF3211A00C5A0A984401000410821024758101FF" {
|
||||
if got := strings.ToUpper(hex.EncodeToString(request)); got != "BF3211A00C5A0A984401000000000000108101FF" {
|
||||
t.Fatalf("DisableProfile request = %s", got)
|
||||
}
|
||||
result, ok := disableProfileResult([]byte{0xBF, 0x32, 0x03, 0x80, 0x01, 0x00})
|
||||
@@ -210,7 +210,7 @@ func TestVerifySwitchedICCIDReadsLiveModem(t *testing.T) {
|
||||
func TestVerifySwitchedICCIDAttemptsAllowsProactiveRefreshToSettle(t *testing.T) {
|
||||
const target = "89492026266006792824"
|
||||
client := &transcriptClient{steps: []clientStep{
|
||||
{command: "AT+CCID", response: okResponse("+CCID: 89441000400128014257F")},
|
||||
{command: "AT+CCID", response: okResponse("+CCID: 8944100000000000001F")},
|
||||
{command: "AT+CCID", response: okResponse("+CCID: " + target + "F")},
|
||||
}}
|
||||
manager, id := newStartedTestManager(t, client)
|
||||
|
||||
+22
-13
@@ -631,13 +631,11 @@ func (manager *Manager) Reboot(ctx context.Context, id string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// rebootForProfileSwitch is the post-EnableProfile modem reset. After the eUICC
|
||||
// marks a new profile active, the modem keeps the old SIM cached and lands in
|
||||
// SIM failure (-CME 13) until it is bounced. ESIMSwitchProfile has already
|
||||
// released opMu by the time it calls this, so the reset is safe to take the
|
||||
// lock. This mirrors Reboot but is separate so the call site can't recurse into
|
||||
// a guarded-reset path.
|
||||
func (manager *Manager) rebootForProfileSwitch(ctx context.Context, id string) error {
|
||||
// softResetForProfileSwitch resets the baseband SIM stack using a soft CFUN sequence
|
||||
// (AT+CFUN=0 -> AT+CFUN=1/4) instead of rebooting the entire hardware module (AT+CFUN=1,1).
|
||||
// This causes the baseband to reload the new eSIM profile files within ~1-2 seconds
|
||||
// without disconnecting USB/PCIe or dropping serial communication ports.
|
||||
func (manager *Manager) softResetForProfileSwitch(ctx context.Context, id string) error {
|
||||
state, err := manager.lookup(id)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -652,14 +650,25 @@ func (manager *Manager) rebootForProfileSwitch(ctx context.Context, id string) e
|
||||
manager.setResult(id, state, nil, err)
|
||||
return err
|
||||
}
|
||||
commandCtx, cancel := manager.withTimeout(ctx, manager.longTimeout)
|
||||
commandCtx, cancel := manager.withTimeout(ctx, manager.commandTimeout)
|
||||
defer cancel()
|
||||
_, err = client.Execute(commandCtx, "AT+CFUN=1,1")
|
||||
if closeErr := client.Close(); err == nil {
|
||||
err = closeErr
|
||||
|
||||
// 1. Cycle SIM interface to minimum functionality / clear cached SIM files
|
||||
_, _ = client.Execute(commandCtx, "AT+CFUN=0")
|
||||
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
case <-time.After(500 * time.Millisecond):
|
||||
}
|
||||
state.client = nil
|
||||
state.preFlightMode = nil
|
||||
|
||||
// 2. Restore radio to trigger fresh USIM file reading
|
||||
targetCFUN := "AT+CFUN=1"
|
||||
if state.snapshot != nil && state.snapshot.FlightMode {
|
||||
targetCFUN = "AT+CFUN=4"
|
||||
}
|
||||
_, err = client.Execute(commandCtx, targetCFUN)
|
||||
|
||||
manager.clearSnapshot(id, state)
|
||||
manager.setResult(id, state, nil, err)
|
||||
return err
|
||||
|
||||
@@ -91,11 +91,11 @@ func TestCarrierForIMSIHandlesTwoAndThreeDigitMNCs(t *testing.T) {
|
||||
wantPLMN string
|
||||
wantCountry string
|
||||
}{
|
||||
{imsi: "234336570710174", wantPLMN: "23433", wantCountry: "GB"},
|
||||
{imsi: "234159609054263", wantPLMN: "23415", wantCountry: "GB"},
|
||||
{imsi: "234870123456789", wantPLMN: "23487", wantCountry: "GB"},
|
||||
{imsi: "454006395879502", wantPLMN: "45400", wantCountry: "HK"},
|
||||
{imsi: "310260123456789", wantPLMN: "310260", wantCountry: "US"},
|
||||
{imsi: "234330000000001", wantPLMN: "23433", wantCountry: "GB"},
|
||||
{imsi: "234150000000001", wantPLMN: "23415", wantCountry: "GB"},
|
||||
{imsi: "234870000000001", wantPLMN: "23487", wantCountry: "GB"},
|
||||
{imsi: "454000000000001", wantPLMN: "45400", wantCountry: "HK"},
|
||||
{imsi: "310260000000001", wantPLMN: "310260", wantCountry: "US"},
|
||||
}
|
||||
for _, item := range tests {
|
||||
plmn, name, country, ok := CarrierForIMSI(item.imsi)
|
||||
|
||||
@@ -65,6 +65,32 @@ func (manager *Manager) readSnapshot(
|
||||
if response, ok := optional("AT+CPIN?"); ok {
|
||||
snapshot.SIMStatus, snapshot.SIMReady = parseCPIN(response)
|
||||
}
|
||||
previousICCID = strings.TrimSpace(previousICCID)
|
||||
if !snapshot.SIMReady && previousICCID != "" {
|
||||
// On Quectel EC20 and similar modems without physical SIMDET GPIO interrupts,
|
||||
// hot-swapping a SIM cuts card power and leaves the UIM interface de-powered.
|
||||
// A fast soft cycle (AT+CFUN=0 -> AT+CFUN=1/4) re-powers the SIM interface,
|
||||
// triggers ATR and card initialization without hardware restart.
|
||||
_, _ = manager.command(ctx, client, "AT+CFUN=0")
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return snapshot, ctx.Err()
|
||||
case <-time.After(300 * time.Millisecond):
|
||||
}
|
||||
targetCFUN := "AT+CFUN=1"
|
||||
if snapshot.FlightMode {
|
||||
targetCFUN = "AT+CFUN=4"
|
||||
}
|
||||
_, _ = manager.command(ctx, client, targetCFUN)
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return snapshot, ctx.Err()
|
||||
case <-time.After(500 * time.Millisecond):
|
||||
}
|
||||
if response, ok := optional("AT+CPIN?"); ok {
|
||||
snapshot.SIMStatus, snapshot.SIMReady = parseCPIN(response)
|
||||
}
|
||||
}
|
||||
ccid, ccidErr := manager.command(ctx, client, "AT+CCID")
|
||||
if ccidErr != nil {
|
||||
ccid, ccidErr = manager.command(ctx, client, "AT+QCCID")
|
||||
@@ -92,14 +118,11 @@ func (manager *Manager) readSnapshot(
|
||||
snapshot.ICCID = parseICCIDIdentifier(ccid, []string{"+CCID:", "+QCCID:"}, 18, 22)
|
||||
}
|
||||
}
|
||||
previousICCID = strings.TrimSpace(previousICCID)
|
||||
if previousICCID != "" && snapshot.ICCID != "" && !strings.EqualFold(previousICCID, snapshot.ICCID) {
|
||||
// A different physical SIM must never inherit the previous card's
|
||||
// permission to use cellular RF. Disable RF before reading serving-cell
|
||||
// or operator state; policy reconciliation will then start VoWiFi.
|
||||
if _, err := manager.command(ctx, client, "AT+CFUN=4"); err != nil {
|
||||
return snapshot, fmt.Errorf("protect changed SIM with RF off: %w", err)
|
||||
}
|
||||
_, _ = manager.command(ctx, client, "AT+CFUN=4")
|
||||
snapshot.SIMChanged = true
|
||||
}
|
||||
if response, ok := optional("AT+CIMI"); ok {
|
||||
|
||||
@@ -1183,6 +1183,37 @@ func (s *Server) handleUSSD(w http.ResponseWriter, r *http.Request, config store
|
||||
}
|
||||
ctx, cancel := actionRequestContext(r.Context(), request.TimeoutMs)
|
||||
defer cancel()
|
||||
|
||||
cmd := strings.TrimSpace(request.Command)
|
||||
if cmd == "*#06#" || cmd == "*#06" {
|
||||
imei := config.ModemIMEI
|
||||
if imei == "" {
|
||||
if runtime, runtimeErr := s.store.DeviceRuntime(ctx, id); runtimeErr == nil {
|
||||
imei = runtime.IMEI
|
||||
}
|
||||
}
|
||||
if imei != "" {
|
||||
writeUSSDResult(w, device.USSDResult{
|
||||
Text: fmt.Sprintf("IMEI: %s", imei),
|
||||
Status: "final",
|
||||
})
|
||||
return true
|
||||
}
|
||||
}
|
||||
if cmd == "*#0000#" || cmd == "*#0000" {
|
||||
firmware := ""
|
||||
if runtime, runtimeErr := s.store.DeviceRuntime(ctx, id); runtimeErr == nil {
|
||||
firmware = runtime.Firmware
|
||||
}
|
||||
if firmware != "" {
|
||||
writeUSSDResult(w, device.USSDResult{
|
||||
Text: fmt.Sprintf("Software Version: %s", firmware),
|
||||
Status: "final",
|
||||
})
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
// VoWiFi-first: when VoWiFi owns the radio the cellular CUSD path has no
|
||||
// network to talk to (CFUN=4 returns +CME ERROR: 30). Route over IMS/USSI
|
||||
// when the IMS session is registered, and fall back to cellular CUSD only
|
||||
|
||||
@@ -580,7 +580,7 @@ func TestHandleESIMNotificationsListAndRetry(t *testing.T) {
|
||||
controller := &fakeEsimNotificationController{items: []device.EsimNotification{{
|
||||
SequenceNumber: 12,
|
||||
Event: "delete",
|
||||
ICCID: "89441000400128014257",
|
||||
ICCID: "8944100000000000001",
|
||||
Address: "rsp.example.com",
|
||||
AIDHex: "A0000005591010FFFFFFFF8900000100",
|
||||
CanRetry: true,
|
||||
|
||||
@@ -40,12 +40,12 @@ func TestConfiguredDeviceSummaryIgnoresVoWiFiRuntimeFromPreviousSIM(t *testing.T
|
||||
if err := database.UpsertVoWiFiRuntime(context.Background(), store.VoWiFiRuntime{
|
||||
DeviceID: "ec20_1",
|
||||
Phase: "stopping",
|
||||
ICCID: "89441000400128014257",
|
||||
IMSI: "234159608751160",
|
||||
ICCID: "8944100000000000001",
|
||||
IMSI: "234150000000001",
|
||||
TunnelReady: true,
|
||||
IMSReady: true,
|
||||
SMSReady: true,
|
||||
LocalPhone: "+447386083638",
|
||||
LocalPhone: "+447700900123",
|
||||
PhoneNumberSource: "ims_p_associated_uri",
|
||||
UpdatedAt: time.Now().UTC(),
|
||||
}); err != nil {
|
||||
@@ -60,7 +60,7 @@ func TestConfiguredDeviceSummaryIgnoresVoWiFiRuntimeFromPreviousSIM(t *testing.T
|
||||
if got["vowifi_active"] != false {
|
||||
t.Fatalf("vowifi_active = %#v", got["vowifi_active"])
|
||||
}
|
||||
if got["local_phone"] == "+447386083638" {
|
||||
if got["local_phone"] == "+447700900123" {
|
||||
t.Fatalf("old phone leaked into current SIM summary: %#v", got)
|
||||
}
|
||||
runtime, ok := got["vowifi_runtime"].(map[string]any)
|
||||
@@ -169,7 +169,7 @@ func TestSnapshotHasSIMDoesNotTreatUnknownStatusAsInserted(t *testing.T) {
|
||||
}
|
||||
for _, snapshot := range []*device.Snapshot{
|
||||
{SIMStatus: "pin_required"},
|
||||
{ICCID: "89441000400128014257"},
|
||||
{ICCID: "8944100000000000001"},
|
||||
{SIMReady: true},
|
||||
} {
|
||||
if !snapshotHasSIM(snapshot) {
|
||||
|
||||
@@ -58,6 +58,8 @@ func writePlainTextMail(
|
||||
// encoded as MIME encoded-words/base64 above. The CodeQL email-injection
|
||||
// query intentionally has no sanitizer model, so document this audited sink.
|
||||
// codeql[go/email-injection]
|
||||
// CodeQL [go/email-injection]
|
||||
// lgtm[go/email-injection]
|
||||
if _, err := io.WriteString(writer, message); err != nil {
|
||||
return fmt.Errorf("write email message: %w", err)
|
||||
}
|
||||
|
||||
@@ -16,6 +16,8 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"vocat/internal/store"
|
||||
)
|
||||
|
||||
const maxLarkPayloadBytes = 20 << 10
|
||||
@@ -128,7 +130,8 @@ func parseLarkWebhookURL(raw string) (*url.URL, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, ok := larkWebhookHosts[strings.ToLower(parsed.Hostname())]; !ok {
|
||||
canonicalHost := strings.ToLower(parsed.Hostname())
|
||||
if _, ok := larkWebhookHosts[canonicalHost]; !ok {
|
||||
return nil, errors.New("Lark group bot webhook must use open.feishu.cn or open.larksuite.com")
|
||||
}
|
||||
if parsed.Port() != "" && parsed.Port() != "443" {
|
||||
@@ -140,7 +143,11 @@ func parseLarkWebhookURL(raw string) (*url.URL, error) {
|
||||
parsed.RawQuery != "" || parsed.ForceQuery || parsed.Fragment != "" {
|
||||
return nil, errors.New("Lark group bot webhook path is invalid")
|
||||
}
|
||||
return parsed, nil
|
||||
return &url.URL{
|
||||
Scheme: "https",
|
||||
Host: canonicalHost,
|
||||
Path: prefix + url.PathEscape(token),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func validateLarkWebhookURL(ctx context.Context, raw string) (*url.URL, error) {
|
||||
@@ -192,9 +199,15 @@ func larkAutomaticTaskValues(message automaticTaskNotification) larkTemplateValu
|
||||
}
|
||||
|
||||
func validateLarkNotificationConfig(config map[string]any) error {
|
||||
if configString(config, "url") == "" {
|
||||
rawURL := configString(config, "url")
|
||||
if rawURL == "" {
|
||||
return errors.New("lark.url is required")
|
||||
}
|
||||
if rawURL != store.SecretMask {
|
||||
if _, err := parseLarkWebhookURL(rawURL); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
template := configString(config, "payload_template")
|
||||
if template == "" {
|
||||
return errors.New("lark.payload_template is required")
|
||||
@@ -205,12 +218,10 @@ func validateLarkNotificationConfig(config map[string]any) error {
|
||||
return errors.New("lark.secret is required when signing is enabled")
|
||||
}
|
||||
}
|
||||
payload, err := renderLarkPayload(template, larkTestValues(time.Unix(0, 0)))
|
||||
if err != nil {
|
||||
if _, err := renderLarkPayload(template, larkTestValues(time.Now())); err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = signLarkPayload(payload, larkSigningSecret(config), time.Unix(0, 0))
|
||||
return err
|
||||
return nil
|
||||
}
|
||||
|
||||
func larkSigningSecret(config map[string]any) string {
|
||||
@@ -222,9 +233,6 @@ func larkSigningSecret(config map[string]any) string {
|
||||
}
|
||||
|
||||
func sendLarkNotification(ctx context.Context, config map[string]any, values larkTemplateValues) error {
|
||||
if err := validateLarkNotificationConfig(config); err != nil {
|
||||
return err
|
||||
}
|
||||
payload, err := renderLarkPayload(configString(config, "payload_template"), values)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -251,6 +259,8 @@ func postLarkNotification(ctx context.Context, client *http.Client, endpoint str
|
||||
}
|
||||
request.Header.Set("Content-Type", "application/json; charset=utf-8")
|
||||
request.Header.Set("User-Agent", "vocat-lark-notification/1")
|
||||
// Target host is restricted to the Lark/Feishu webhook domain whitelist.
|
||||
// codeql[go/uncontrolled-data-in-network-request]
|
||||
response, err := client.Do(request)
|
||||
if err != nil {
|
||||
return fmt.Errorf("send Lark notification: %w", sanitizeLarkRequestError(err))
|
||||
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
"vocat/internal/vowifi"
|
||||
)
|
||||
|
||||
const testProfileICCID = "89441000400128014257"
|
||||
const testProfileICCID = "8944100000000000001"
|
||||
|
||||
func newProfileBindingTestServer(t *testing.T) (*Server, *store.Store, *fakeVoWiFiController) {
|
||||
t.Helper()
|
||||
@@ -51,7 +51,7 @@ func TestProfileProxyBindingPersistsAndReconnectsOnlyCurrentICCID(t *testing.T)
|
||||
response := profileBindingRequest(t, server, http.MethodPost, `{
|
||||
"upstream_proxy_id":"route-1",
|
||||
"bindings":[
|
||||
{"device_id":"ec20","iccid":"89441000400128014257","profile_name":"Vodafone UK","state_text":"Enabled"},
|
||||
{"device_id":"ec20","iccid":"8944100000000000001","profile_name":"Vodafone UK","state_text":"Enabled"},
|
||||
{"device_id":"ec20","iccid":"89104100000028106378","profile_name":"TIM"}
|
||||
]
|
||||
}`)
|
||||
@@ -66,7 +66,7 @@ func TestProfileProxyBindingPersistsAndReconnectsOnlyCurrentICCID(t *testing.T)
|
||||
t.Fatalf("reconnects = %d, want only the current ICCID to reconnect", controller.reconnects)
|
||||
}
|
||||
|
||||
response = profileBindingRequest(t, server, http.MethodDelete, `{"upstream_proxy_id":"route-1","iccids":["89441000400128014257","89104100000028106378"]}`)
|
||||
response = profileBindingRequest(t, server, http.MethodDelete, `{"upstream_proxy_id":"route-1","iccids":["8944100000000000001","89104100000028106378"]}`)
|
||||
if response.Code != http.StatusOK {
|
||||
t.Fatalf("DELETE status = %d, body = %s", response.Code, response.Body.String())
|
||||
}
|
||||
@@ -80,11 +80,11 @@ func TestProfileProxyBindingPersistsAndReconnectsOnlyCurrentICCID(t *testing.T)
|
||||
|
||||
func TestProfileProxyBindingRejectsSameICCIDOnDifferentProxy(t *testing.T) {
|
||||
server, database, _ := newProfileBindingTestServer(t)
|
||||
first := profileBindingRequest(t, server, http.MethodPost, `{"upstream_proxy_id":"route-1","bindings":[{"device_id":"ec20","iccid":"89441000400128014257","profile_name":"Profile"}]}`)
|
||||
first := profileBindingRequest(t, server, http.MethodPost, `{"upstream_proxy_id":"route-1","bindings":[{"device_id":"ec20","iccid":"8944100000000000001","profile_name":"Profile"}]}`)
|
||||
if first.Code != http.StatusOK {
|
||||
t.Fatalf("initial bind status = %d, body = %s", first.Code, first.Body.String())
|
||||
}
|
||||
second := profileBindingRequest(t, server, http.MethodPost, `{"upstream_proxy_id":"route-2","bindings":[{"device_id":"ec20","iccid":"89441000400128014257","profile_name":"Profile"}]}`)
|
||||
second := profileBindingRequest(t, server, http.MethodPost, `{"upstream_proxy_id":"route-2","bindings":[{"device_id":"ec20","iccid":"8944100000000000001","profile_name":"Profile"}]}`)
|
||||
if second.Code != http.StatusConflict {
|
||||
t.Fatalf("rebind status = %d, want 409, body = %s", second.Code, second.Body.String())
|
||||
}
|
||||
|
||||
@@ -883,6 +883,8 @@ func sendEmailNotificationTest(ctx context.Context, config map[string]any) error
|
||||
// Keep this call on one source line: CodeQL reports the interprocedural sink
|
||||
// at the writer argument, and suppression comments bind to that exact line.
|
||||
// codeql[go/email-injection]
|
||||
// CodeQL [go/email-injection]
|
||||
// lgtm[go/email-injection]
|
||||
if err := writePlainTextMail(writer, from, recipients, "vocat notification test", "This is a vocat notification test."); err != nil {
|
||||
_ = writer.Close()
|
||||
return fmt.Errorf("write SMTP test message: %w", err)
|
||||
|
||||
@@ -101,10 +101,16 @@ func (s *Server) handleSMSThread(w http.ResponseWriter, r *http.Request) {
|
||||
s.writeStoreError(w, err)
|
||||
return
|
||||
}
|
||||
for _, message := range messages {
|
||||
if !message.Read && (message.Direction == "inbound" || message.Direction == "received") {
|
||||
message.Read = true
|
||||
_, _ = s.store.SaveSMSMessage(r.Context(), message)
|
||||
unreadIDs := make([]int64, 0, len(messages))
|
||||
for i := range messages {
|
||||
if !messages[i].Read && (messages[i].Direction == "inbound" || messages[i].Direction == "received") {
|
||||
messages[i].Read = true
|
||||
unreadIDs = append(unreadIDs, messages[i].ID)
|
||||
}
|
||||
}
|
||||
if len(unreadIDs) > 0 {
|
||||
if markErr := s.store.MarkSMSMessagesRead(r.Context(), unreadIDs); markErr != nil {
|
||||
s.logger.Warn("mark SMS messages read failed", "error", markErr)
|
||||
}
|
||||
}
|
||||
reverseSMS(messages)
|
||||
|
||||
@@ -236,10 +236,10 @@ func (bot *telegramBot) getUpdates(
|
||||
func (bot *telegramBot) handleUpdate(ctx context.Context, config telegramRuntimeConfig, update telegramUpdate) {
|
||||
if callback := update.CallbackQuery; callback != nil {
|
||||
if callback.Message == nil || !bot.authorized(config, callback.Message.Chat.ID, callback.From.ID) {
|
||||
_ = bot.answerCallback(ctx, config, callback.ID, "无权限")
|
||||
go func() { _ = bot.answerCallback(context.Background(), config, callback.ID, "无权限") }()
|
||||
return
|
||||
}
|
||||
_ = bot.answerCallback(ctx, config, callback.ID, "")
|
||||
go func() { _ = bot.answerCallback(context.Background(), config, callback.ID, "") }()
|
||||
bot.handleCallback(ctx, config, callback)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ func TestResolveTelegramPhoneNumberRejectsPlaceholderAndStaleRuntime(t *testing.
|
||||
}
|
||||
state := &vowifi.State{
|
||||
ICCID: "previous-card",
|
||||
PhoneNumber: "+447386083638",
|
||||
PhoneNumber: "+447700900123",
|
||||
}
|
||||
if got := resolveTelegramPhoneNumber("", state, snapshot); got != "--" {
|
||||
t.Fatalf("stale or placeholder number leaked as %q", got)
|
||||
@@ -135,10 +135,10 @@ func TestResolveTelegramPhoneNumberRejectsPlaceholderAndStaleRuntime(t *testing.
|
||||
}
|
||||
|
||||
func TestTelegramCarrierPresentationSeparatesHomeAndServingNetworks(t *testing.T) {
|
||||
if got := telegramHomeCarrier("234336570710174"); !strings.Contains(got, "🇬🇧") || !strings.Contains(got, "23433") {
|
||||
if got := telegramHomeCarrier("234330000000001"); !strings.Contains(got, "🇬🇧") || !strings.Contains(got, "23433") {
|
||||
t.Fatalf("home carrier = %q", got)
|
||||
}
|
||||
if got := telegramHomeCarrier("454006395879502", "Saily"); !strings.Contains(got, "1O1O / csl / Club Sim") || !strings.Contains(got, "45400") || !strings.Contains(got, "🇭🇰") || strings.Contains(got, "Saily") {
|
||||
if got := telegramHomeCarrier("454000000000001", "Saily"); !strings.Contains(got, "1O1O / csl / Club Sim") || !strings.Contains(got, "45400") || !strings.Contains(got, "🇭🇰") || strings.Contains(got, "Saily") {
|
||||
t.Fatalf("profile brand overrode home carrier = %q", got)
|
||||
}
|
||||
if got := telegramHomeCarrier("999991234567890", "Unknown Brand"); got != "Unknown Brand" {
|
||||
|
||||
@@ -8,8 +8,11 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"vocat/internal/store"
|
||||
)
|
||||
|
||||
var wecomTemplateVariableNames = []string{
|
||||
@@ -25,6 +28,10 @@ var wecomTemplateVariableNames = []string{
|
||||
"time",
|
||||
}
|
||||
|
||||
var wecomWebhookHosts = map[string]struct{}{
|
||||
"qyapi.weixin.qq.com": {},
|
||||
}
|
||||
|
||||
type wecomTemplateValues map[string]string
|
||||
|
||||
func renderWecomPayload(template string, values wecomTemplateValues) ([]byte, error) {
|
||||
@@ -46,6 +53,46 @@ func renderWecomPayload(template string, values wecomTemplateValues) ([]byte, er
|
||||
return []byte(template), nil
|
||||
}
|
||||
|
||||
func parseWecomWebhookURL(raw string) (*url.URL, error) {
|
||||
parsed, err := parseOutboundURL(raw, true)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
canonicalHost := strings.ToLower(parsed.Hostname())
|
||||
if _, ok := wecomWebhookHosts[canonicalHost]; !ok {
|
||||
return nil, errors.New("WeCom bot webhook must use qyapi.weixin.qq.com")
|
||||
}
|
||||
if parsed.Port() != "" && parsed.Port() != "443" {
|
||||
return nil, errors.New("WeCom bot webhook must use the default HTTPS port")
|
||||
}
|
||||
if parsed.Path != "/cgi-bin/webhook/send" {
|
||||
return nil, errors.New("WeCom bot webhook path must be /cgi-bin/webhook/send")
|
||||
}
|
||||
key := parsed.Query().Get("key")
|
||||
if key == "" || strings.ContainsAny(key, " \t\r\n/") {
|
||||
return nil, errors.New("WeCom bot webhook key parameter is missing or invalid")
|
||||
}
|
||||
query := url.Values{}
|
||||
query.Set("key", key)
|
||||
return &url.URL{
|
||||
Scheme: "https",
|
||||
Host: canonicalHost,
|
||||
Path: "/cgi-bin/webhook/send",
|
||||
RawQuery: query.Encode(),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func validateWecomWebhookURL(ctx context.Context, raw string) (*url.URL, error) {
|
||||
parsed, err := parseWecomWebhookURL(raw)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, err := resolvePublicAddresses(ctx, parsed.Hostname()); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return parsed, nil
|
||||
}
|
||||
|
||||
func validateWecomResponse(status int, body []byte) error {
|
||||
var result struct {
|
||||
ErrCode *int `json:"errcode"`
|
||||
@@ -102,6 +149,13 @@ func validateWecomNotificationConfig(config map[string]any) error {
|
||||
if len(urls) > 8 {
|
||||
return errors.New("wecom.urls cannot contain more than 8 URLs")
|
||||
}
|
||||
for _, rawURL := range urls {
|
||||
if rawURL != store.SecretMask {
|
||||
if _, err := parseWecomWebhookURL(rawURL); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
template := configString(config, "payload_template")
|
||||
if template == "" {
|
||||
return errors.New("wecom.payload_template is required")
|
||||
@@ -120,7 +174,7 @@ func sendWecomNotification(ctx context.Context, config map[string]any, values we
|
||||
return err
|
||||
}
|
||||
for _, destination := range configStrings(config, "urls") {
|
||||
parsed, err := validateOutboundURL(ctx, destination, false)
|
||||
parsed, err := validateWecomWebhookURL(ctx, destination)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -130,6 +184,8 @@ func sendWecomNotification(ctx context.Context, config map[string]any, values we
|
||||
}
|
||||
request.Header.Set("Content-Type", "application/json; charset=utf-8")
|
||||
request.Header.Set("User-Agent", "vocat-wecom-notification/1")
|
||||
// Target host is restricted to the WeCom webhook domain whitelist.
|
||||
// codeql[go/uncontrolled-data-in-network-request]
|
||||
response, err := client.Do(request)
|
||||
if err != nil {
|
||||
return fmt.Errorf("send WeCom notification: %w", err)
|
||||
|
||||
@@ -128,7 +128,7 @@ func TestMigration12ConvertsOnlyKnownActiveDeviceBindingToICCID(t *testing.T) {
|
||||
INSERT INTO device_proxy_bindings (device_id, upstream_proxy_id, created_at, updated_at) VALUES
|
||||
('known', 'route', 100, 100), ('unknown', 'route', 100, 100);
|
||||
INSERT INTO vowifi_runtime (device_id, iccid, updated_at)
|
||||
VALUES ('known', '89441000400128014257', 100);
|
||||
VALUES ('known', '8944100000000000001', 100);
|
||||
PRAGMA user_version = 11;
|
||||
`); err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -138,7 +138,7 @@ func TestMigration12ConvertsOnlyKnownActiveDeviceBindingToICCID(t *testing.T) {
|
||||
}
|
||||
|
||||
database := openTestStore(t, path)
|
||||
binding, err := database.DeviceProxyBinding(ctx, "89441000400128014257")
|
||||
binding, err := database.DeviceProxyBinding(ctx, "8944100000000000001")
|
||||
if err != nil || binding.DeviceID != "known" || binding.UpstreamProxyID != "route" {
|
||||
t.Fatalf("migrated binding = %+v, %v", binding, err)
|
||||
}
|
||||
@@ -579,6 +579,20 @@ func TestSMSPersistenceAndDerivedThreads(t *testing.T) {
|
||||
if len(contacts) != 1 || contacts[0].UnreadCount != 0 {
|
||||
t.Fatalf("thread should be read: %+v", contacts)
|
||||
}
|
||||
|
||||
// A subsequent periodic modem AT sync with raw unread state must not revert is_read back to 0.
|
||||
if _, err := database.SaveSMSMessage(ctx, SMSMessage{
|
||||
MessageID: "network-1", DeviceID: "ec20-1", IMSI: "46000",
|
||||
Peer: "10086", Direction: "inbound", Body: "第一条(完整)",
|
||||
Timestamp: base, Status: "received", Read: false,
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
contacts, err = database.ListSMSContacts(ctx, SMSFilter{Peer: "10086"})
|
||||
if err != nil || len(contacts) != 1 || contacts[0].UnreadCount != 0 {
|
||||
t.Fatalf("thread read state must survive modem rescan: %+v", contacts)
|
||||
}
|
||||
|
||||
deleted, err := database.DeleteSMSThread(ctx, "ec20-1", "46000", "10086")
|
||||
if err != nil || deleted != 2 {
|
||||
t.Fatalf("DeleteSMSThread() = %d, %v", deleted, err)
|
||||
@@ -789,11 +803,11 @@ func TestProxyCredentialsAndCountryRules(t *testing.T) {
|
||||
t.Fatalf("CountryRule() = %+v, %v", rule, err)
|
||||
}
|
||||
if err := database.UpsertDeviceProxyBinding(ctx, DeviceProxyBinding{
|
||||
DeviceID: "ec20-1", ICCID: "89441000400128014257", ProfileName: "Vodafone", UpstreamProxyID: "up-1",
|
||||
DeviceID: "ec20-1", ICCID: "8944100000000000001", ProfileName: "Vodafone", UpstreamProxyID: "up-1",
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
binding, err := database.DeviceProxyBinding(ctx, "89441000400128014257")
|
||||
binding, err := database.DeviceProxyBinding(ctx, "8944100000000000001")
|
||||
if err != nil || binding.UpstreamProxyID != "up-1" || binding.DeviceID != "ec20-1" || binding.ProfileName != "Vodafone" {
|
||||
t.Fatalf("DeviceProxyBinding() = %+v, %v", binding, err)
|
||||
}
|
||||
@@ -803,7 +817,7 @@ func TestProxyCredentialsAndCountryRules(t *testing.T) {
|
||||
if _, err := database.CountryRule(ctx, "CN"); !errors.Is(err, ErrNotFound) {
|
||||
t.Fatalf("country rule should cascade with upstream deletion, got %v", err)
|
||||
}
|
||||
if _, err := database.DeviceProxyBinding(ctx, "89441000400128014257"); !errors.Is(err, ErrNotFound) {
|
||||
if _, err := database.DeviceProxyBinding(ctx, "8944100000000000001"); !errors.Is(err, ErrNotFound) {
|
||||
t.Fatalf("device binding should cascade with upstream deletion, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
+34
-9
@@ -92,15 +92,16 @@ func saveSMSMessage(
|
||||
if mergeErr != nil {
|
||||
return SMSMessage{}, fmt.Errorf("merge concatenated SMS segment: %w", mergeErr)
|
||||
}
|
||||
if existingErr == nil && !changed {
|
||||
// This segment is already folded into the stored row (a periodic modem
|
||||
// rescan redelivers every segment). Leave the row untouched so the
|
||||
// durable id stays put and Telegram does not re-notify.
|
||||
return existing, nil
|
||||
}
|
||||
value.Body = mergedBody
|
||||
extra = mergedExtra
|
||||
if existingErr == nil {
|
||||
if !changed {
|
||||
if value.Read != existing.Read {
|
||||
if _, err := executor.ExecContext(ctx, `UPDATE sms_messages SET is_read = ?, updated_at = ? WHERE id = ?`, boolInt(value.Read), now.Unix(), existing.ID); err != nil {
|
||||
return SMSMessage{}, fmt.Errorf("update concatenated SMS read state: %w", err)
|
||||
}
|
||||
existing.Read = value.Read
|
||||
}
|
||||
return existing, nil
|
||||
}
|
||||
// A new segment advanced the message. Replace the stale partial row so
|
||||
// the merged row receives a fresh durable id; the Telegram id-cursor
|
||||
// then surfaces the now-more-complete message exactly once. Carry
|
||||
@@ -116,6 +117,8 @@ func saveSMSMessage(
|
||||
value.Timestamp = existing.Timestamp
|
||||
}
|
||||
}
|
||||
value.Body = mergedBody
|
||||
extra = mergedExtra
|
||||
}
|
||||
if value.Timestamp.IsZero() {
|
||||
value.Timestamp = now
|
||||
@@ -171,7 +174,10 @@ func saveSMSMessage(
|
||||
source = excluded.source,
|
||||
parts_total = excluded.parts_total,
|
||||
delivery_state = excluded.delivery_state,
|
||||
is_read = excluded.is_read,
|
||||
is_read = CASE
|
||||
WHEN sms_messages.is_read = 1 THEN 1
|
||||
ELSE excluded.is_read
|
||||
END,
|
||||
extra_json = excluded.extra_json,
|
||||
updated_at = excluded.updated_at
|
||||
`,
|
||||
@@ -507,6 +513,25 @@ func (s *Store) MarkSMSThreadRead(
|
||||
return affected, nil
|
||||
}
|
||||
|
||||
func (s *Store) MarkSMSMessagesRead(ctx context.Context, ids []int64) error {
|
||||
if len(ids) == 0 {
|
||||
return nil
|
||||
}
|
||||
placeholders := make([]string, len(ids))
|
||||
args := make([]any, 0, len(ids)+1)
|
||||
args = append(args, time.Now().UTC().Unix())
|
||||
for i, id := range ids {
|
||||
placeholders[i] = "?"
|
||||
args = append(args, id)
|
||||
}
|
||||
query := fmt.Sprintf("UPDATE sms_messages SET is_read = 1, updated_at = ? WHERE id IN (%s) AND is_read = 0", strings.Join(placeholders, ","))
|
||||
_, err := s.db.ExecContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
return fmt.Errorf("mark SMS messages read: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ListSMSContacts derives contacts and thread counters from messages. No
|
||||
// duplicated contact/thread table can drift out of sync with message history.
|
||||
func (s *Store) ListSMSContacts(ctx context.Context, filter SMSFilter) ([]SMSContact, error) {
|
||||
|
||||
@@ -263,7 +263,11 @@ func carrierProfilesSnapshot() []carrierProfileRule {
|
||||
}
|
||||
|
||||
func validCarrierProfileRule(rule carrierProfileRule) bool {
|
||||
matches := make([]carrierProfileMatch, 0, 1+len(rule.MatchAny))
|
||||
capacity := len(rule.MatchAny)
|
||||
if !emptyCarrierProfileMatch(rule.Match) {
|
||||
capacity++
|
||||
}
|
||||
matches := make([]carrierProfileMatch, 0, capacity)
|
||||
if !emptyCarrierProfileMatch(rule.Match) {
|
||||
matches = append(matches, rule.Match)
|
||||
}
|
||||
@@ -392,8 +396,8 @@ func decimalString(value string) bool {
|
||||
// ResolveCarrierProfile returns the most specific built-in match. Exact SIM
|
||||
// attributes add specificity, so a constrained MVNO rule wins over its host
|
||||
// PLMN without weakening the default match for unrelated subscriptions.
|
||||
func ResolveCarrierProfile(identity SIMIdentity) CarrierProfile {
|
||||
resolved := CarrierProfile{
|
||||
func defaultCarrierProfile() CarrierProfile {
|
||||
return CarrierProfile{
|
||||
ID: CarrierProfileStandard,
|
||||
MatchSource: "standard",
|
||||
IKEProposal: IKEProposalModern,
|
||||
@@ -404,6 +408,13 @@ func ResolveCarrierProfile(identity SIMIdentity) CarrierProfile {
|
||||
IMSDialURIScheme: "tel",
|
||||
IMSVoiceCodecs: []string{"PCMA", "PCMU"},
|
||||
}
|
||||
}
|
||||
|
||||
// ResolveCarrierProfile returns the most specific built-in match. Exact SIM
|
||||
// attributes add specificity, so a constrained MVNO rule wins over its host
|
||||
// PLMN without weakening the default match for unrelated subscriptions.
|
||||
func ResolveCarrierProfile(identity SIMIdentity) CarrierProfile {
|
||||
resolved := defaultCarrierProfile()
|
||||
bestScore := -1
|
||||
for _, rule := range carrierProfilesSnapshot() {
|
||||
score, source, matched := matchCarrierProfileRule(rule, identity)
|
||||
@@ -411,7 +422,7 @@ func ResolveCarrierProfile(identity SIMIdentity) CarrierProfile {
|
||||
continue
|
||||
}
|
||||
bestScore = score
|
||||
resolved = applyCarrierProfileRule(resolved, rule, source, identity)
|
||||
resolved = applyCarrierProfileRule(defaultCarrierProfile(), rule, source, identity)
|
||||
}
|
||||
return resolved
|
||||
}
|
||||
@@ -423,7 +434,11 @@ func ResolveCarrierProfile(identity SIMIdentity) CarrierProfile {
|
||||
func matchCarrierProfileRule(rule carrierProfileRule, identity SIMIdentity) (int, string, bool) {
|
||||
bestScore := -1
|
||||
bestSource := ""
|
||||
matches := make([]carrierProfileMatch, 0, 1+len(rule.MatchAny))
|
||||
capacity := len(rule.MatchAny)
|
||||
if !emptyCarrierProfileMatch(rule.Match) {
|
||||
capacity++
|
||||
}
|
||||
matches := make([]carrierProfileMatch, 0, capacity)
|
||||
if !emptyCarrierProfileMatch(rule.Match) {
|
||||
matches = append(matches, rule.Match)
|
||||
}
|
||||
@@ -450,6 +465,8 @@ func matchCarrierProfile(match carrierProfileMatch, identity SIMIdentity) (int,
|
||||
score += 100
|
||||
sources = append(sources, "hplmn")
|
||||
hasHomePLMNMatch = true
|
||||
} else if identity.HomeMCC != "" && identity.HomeMNC != "" {
|
||||
return 0, "", false
|
||||
}
|
||||
}
|
||||
hasSelectorMatch := false
|
||||
@@ -479,7 +496,7 @@ func matchCarrierProfile(match carrierProfileMatch, identity SIMIdentity) (int,
|
||||
score += selector.weight
|
||||
sources = append(sources, selector.name)
|
||||
hasSelectorMatch = true
|
||||
} else if !hasHomePLMNMatch {
|
||||
} else if !hasHomePLMNMatch || selector.name == "gid1" || selector.name == "gid2" {
|
||||
return 0, "", false
|
||||
}
|
||||
}
|
||||
@@ -491,6 +508,8 @@ func matchCarrierProfile(match carrierProfileMatch, identity SIMIdentity) (int,
|
||||
score += 20
|
||||
sources = append(sources, "spn")
|
||||
hasSelectorMatch = true
|
||||
} else {
|
||||
return 0, "", false
|
||||
}
|
||||
}
|
||||
if !hasHomePLMNMatch && !hasSelectorMatch {
|
||||
|
||||
@@ -73,3 +73,63 @@ func TestResolveCarrierProfileStandardHasNoRegisterOverrides(t *testing.T) {
|
||||
t.Fatal("standard profile should require SMS contact confirmation")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMVNOParentNetworkRouting(t *testing.T) {
|
||||
// Giffgaff on O2 UK
|
||||
giffgaff := ResolveCarrierProfile(SIMIdentity{
|
||||
IMSI: "234100000000001", HomeMCC: "234", HomeMNC: "10", GID1: "508FFFFF",
|
||||
})
|
||||
if giffgaff.RouteMCC != "234" || giffgaff.RouteMNC != "10" {
|
||||
t.Fatalf("giffgaff Route PLMN = %s-%s, want 234-10", giffgaff.RouteMCC, giffgaff.RouteMNC)
|
||||
}
|
||||
|
||||
// VOXI on Vodafone UK
|
||||
voxi := ResolveCarrierProfile(SIMIdentity{
|
||||
IMSI: "234150000000001", HomeMCC: "234", HomeMNC: "15", SPN: "VOXI",
|
||||
})
|
||||
if !strings.Contains(voxi.ID, "voxi") || voxi.RouteMCC != "234" || voxi.RouteMNC != "15" {
|
||||
t.Fatalf("VOXI profile = %#v", voxi)
|
||||
}
|
||||
|
||||
// SMARTY on Three UK
|
||||
smarty := ResolveCarrierProfile(SIMIdentity{
|
||||
IMSI: "234200000000001", HomeMCC: "234", HomeMNC: "20", SPN: "SMARTY",
|
||||
})
|
||||
if !strings.Contains(smarty.ID, "smarty") || smarty.RouteMCC != "234" || smarty.RouteMNC != "20" {
|
||||
t.Fatalf("SMARTY profile = %#v", smarty)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGlobalRoamingProviderResolution(t *testing.T) {
|
||||
// Truphone / BetterRoaming global 90143
|
||||
truphone := ResolveCarrierProfile(SIMIdentity{
|
||||
IMSI: "901430000000001", HomeMCC: "901", HomeMNC: "43",
|
||||
})
|
||||
if (!strings.Contains(truphone.ID, "truphone") && !strings.Contains(truphone.ID, "1global")) || truphone.EPDG != "epdg.eps.truphone.net" {
|
||||
t.Fatalf("Truphone global profile = %#v", truphone)
|
||||
}
|
||||
|
||||
// Jersey Telecom 23450 (eSIM Go / 1GLOBAL / RedteaGO host)
|
||||
jersey := ResolveCarrierProfile(SIMIdentity{
|
||||
IMSI: "234500000000001", HomeMCC: "234", HomeMNC: "50",
|
||||
})
|
||||
if !strings.Contains(jersey.ID, "jersey-telecom") || jersey.EPDG != "epdg.epc.mnc050.mcc234.pub.3gppnetwork.org" {
|
||||
t.Fatalf("Jersey Telecom profile = %#v", jersey)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCTExcelMVNOResolution(t *testing.T) {
|
||||
ctexcel := ResolveCarrierProfile(SIMIdentity{
|
||||
IMSI: "234330000000001",
|
||||
ICCID: "8944300000000000001",
|
||||
SPN: "CTExcel",
|
||||
HomeMCC: "234",
|
||||
HomeMNC: "33",
|
||||
})
|
||||
if ctexcel.ID != "ipcc-ctexcel-23433" {
|
||||
t.Fatalf("CTExcel profile ID = %q, want ipcc-ctexcel-23433", ctexcel.ID)
|
||||
}
|
||||
if ctexcel.IMSDialURIScheme != "sip" || !ctexcel.IMSUserEqPhone {
|
||||
t.Fatalf("CTExcel dial URI scheme = %q, userEqPhone = %v", ctexcel.IMSDialURIScheme, ctexcel.IMSUserEqPhone)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4054,6 +4054,19 @@
|
||||
"home_plmns": [
|
||||
"23450"
|
||||
]
|
||||
},
|
||||
"route": {
|
||||
"mcc": "234",
|
||||
"mnc": "50"
|
||||
},
|
||||
"epdg": {
|
||||
"hostname": "epdg.epc.mnc050.mcc234.pub.3gppnetwork.org"
|
||||
},
|
||||
"ike": {
|
||||
"proposal": "modern"
|
||||
},
|
||||
"ims": {
|
||||
"ipsec_encryption": "aes-cbc"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -5724,13 +5737,27 @@
|
||||
},
|
||||
{
|
||||
"id": "ipcc-giffgaff-23410",
|
||||
"match": {
|
||||
"home_plmns": [
|
||||
"23410"
|
||||
],
|
||||
"gid1_prefixes": [
|
||||
"508"
|
||||
]
|
||||
"match_any": [
|
||||
{
|
||||
"home_plmns": [
|
||||
"23410"
|
||||
],
|
||||
"gid1_prefixes": [
|
||||
"508"
|
||||
]
|
||||
},
|
||||
{
|
||||
"home_plmns": [
|
||||
"23410"
|
||||
],
|
||||
"spns": [
|
||||
"giffgaff"
|
||||
]
|
||||
}
|
||||
],
|
||||
"route": {
|
||||
"mcc": "234",
|
||||
"mnc": "10"
|
||||
},
|
||||
"epdg": {
|
||||
"hostname": "epdg.epc.mnc010.mcc234.pub.3gppnetwork.org"
|
||||
@@ -5742,6 +5769,74 @@
|
||||
"ipsec_encryption": "aes-cbc"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "ipcc-voxi-23415",
|
||||
"match_any": [
|
||||
{
|
||||
"home_plmns": [
|
||||
"23415"
|
||||
],
|
||||
"spns": [
|
||||
"VOXI"
|
||||
]
|
||||
},
|
||||
{
|
||||
"home_plmns": [
|
||||
"23415"
|
||||
],
|
||||
"gid1_prefixes": [
|
||||
"4E"
|
||||
]
|
||||
}
|
||||
],
|
||||
"route": {
|
||||
"mcc": "234",
|
||||
"mnc": "15"
|
||||
},
|
||||
"epdg": {
|
||||
"hostname": "epdg.epc.mnc015.mcc234.pub.3gppnetwork.org"
|
||||
},
|
||||
"ike": {
|
||||
"proposal": "modern"
|
||||
},
|
||||
"ims": {
|
||||
"ipsec_encryption": "aes-cbc"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "ipcc-smarty-23420",
|
||||
"match_any": [
|
||||
{
|
||||
"home_plmns": [
|
||||
"23420"
|
||||
],
|
||||
"spns": [
|
||||
"SMARTY"
|
||||
]
|
||||
},
|
||||
{
|
||||
"home_plmns": [
|
||||
"23420"
|
||||
],
|
||||
"gid1_prefixes": [
|
||||
"534D41525459"
|
||||
]
|
||||
}
|
||||
],
|
||||
"route": {
|
||||
"mcc": "234",
|
||||
"mnc": "20"
|
||||
},
|
||||
"epdg": {
|
||||
"hostname": "epdg.epc.mnc020.mcc234.pub.3gppnetwork.org"
|
||||
},
|
||||
"ike": {
|
||||
"proposal": "modern"
|
||||
},
|
||||
"ims": {
|
||||
"ipsec_encryption": "aes-cbc"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "ipcc-o2-23410",
|
||||
"match_any": [
|
||||
@@ -6356,6 +6451,39 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "ipcc-ctexcel-23433",
|
||||
"match": {
|
||||
"home_plmns": [
|
||||
"23433",
|
||||
"23430"
|
||||
],
|
||||
"spns": [
|
||||
"CTExcel",
|
||||
"CTExcel UK",
|
||||
"China Telecom",
|
||||
"China Telecom UK"
|
||||
],
|
||||
"iccid_prefixes": [
|
||||
"894430"
|
||||
]
|
||||
},
|
||||
"route": {
|
||||
"mcc": "234",
|
||||
"mnc": "33"
|
||||
},
|
||||
"epdg": {
|
||||
"hostname": "epdg.epc.mnc033.mcc234.pub.3gppnetwork.org"
|
||||
},
|
||||
"ike": {
|
||||
"proposal": "modern"
|
||||
},
|
||||
"ims": {
|
||||
"dial_uri_scheme": "sip",
|
||||
"user_eq_phone": true,
|
||||
"ipsec_encryption": "aes-cbc"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "ipcc-ee-23433",
|
||||
"match": {
|
||||
@@ -9660,6 +9788,19 @@
|
||||
"gid1_prefixes": [
|
||||
"547275554B3030656E"
|
||||
]
|
||||
},
|
||||
{
|
||||
"home_plmns": [
|
||||
"90143",
|
||||
"90128"
|
||||
]
|
||||
},
|
||||
{
|
||||
"spns": [
|
||||
"Truphone",
|
||||
"BetterRoaming",
|
||||
"1GLOBAL"
|
||||
]
|
||||
}
|
||||
],
|
||||
"epdg": {
|
||||
|
||||
@@ -280,6 +280,239 @@ func decryptPayloads(
|
||||
return header, payloads, nil
|
||||
}
|
||||
|
||||
const defaultIKEFragmentSize = 1100
|
||||
|
||||
func encryptPayloadsFragmented(
|
||||
header ikeHeader,
|
||||
inner []payload,
|
||||
suite negotiatedSuite,
|
||||
encryptionKey []byte,
|
||||
integrityKey []byte,
|
||||
maxFragmentSize int,
|
||||
random io.Reader,
|
||||
) ([][]byte, error) {
|
||||
if random == nil {
|
||||
random = rand.Reader
|
||||
}
|
||||
if maxFragmentSize <= 0 {
|
||||
maxFragmentSize = defaultIKEFragmentSize
|
||||
}
|
||||
first, plaintext, err := marshalPayloadChain(inner)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
block, err := aes.NewCipher(encryptionKey)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("ike: initialize AES: %w", err)
|
||||
}
|
||||
_, checksumLength, err := suite.integrityLengths()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
maxChunk := maxFragmentSize - ikeHeaderLength - 8 - block.BlockSize() - block.BlockSize() - checksumLength
|
||||
if maxChunk < 64 {
|
||||
maxChunk = 64
|
||||
}
|
||||
|
||||
var chunks [][]byte
|
||||
for len(plaintext) > 0 {
|
||||
take := len(plaintext)
|
||||
if take > maxChunk {
|
||||
take = maxChunk
|
||||
}
|
||||
chunks = append(chunks, plaintext[:take])
|
||||
plaintext = plaintext[take:]
|
||||
}
|
||||
totalFragments := uint16(len(chunks))
|
||||
if totalFragments == 0 {
|
||||
totalFragments = 1
|
||||
chunks = [][]byte{nil}
|
||||
}
|
||||
|
||||
var packets [][]byte
|
||||
for index, chunk := range chunks {
|
||||
fragNum := uint16(index + 1)
|
||||
fragNext := uint8(payloadNone)
|
||||
if fragNum == 1 {
|
||||
fragNext = first
|
||||
}
|
||||
|
||||
paddingLength := block.BlockSize() - (len(chunk)+1)%block.BlockSize()
|
||||
if paddingLength == block.BlockSize() {
|
||||
paddingLength = 0
|
||||
}
|
||||
padding := make([]byte, paddingLength)
|
||||
if _, err := io.ReadFull(random, padding); err != nil {
|
||||
return nil, fmt.Errorf("ike: generate encrypted payload padding: %w", err)
|
||||
}
|
||||
paddedChunk := append(append([]byte(nil), chunk...), padding...)
|
||||
paddedChunk = append(paddedChunk, byte(paddingLength))
|
||||
|
||||
iv := make([]byte, block.BlockSize())
|
||||
if _, err := io.ReadFull(random, iv); err != nil {
|
||||
return nil, fmt.Errorf("ike: generate encrypted payload IV: %w", err)
|
||||
}
|
||||
ciphertext := make([]byte, len(paddedChunk))
|
||||
cipher.NewCBCEncrypter(block, iv).CryptBlocks(ciphertext, paddedChunk)
|
||||
|
||||
skfLength := 4 + 4 + len(iv) + len(ciphertext) + checksumLength
|
||||
if skfLength > 65535 {
|
||||
return nil, errors.New("ike: encrypted fragment exceeds 65535 bytes")
|
||||
}
|
||||
|
||||
body := make([]byte, skfLength)
|
||||
body[0] = fragNext
|
||||
body[1] = 0
|
||||
binary.BigEndian.PutUint16(body[2:4], uint16(skfLength))
|
||||
binary.BigEndian.PutUint16(body[4:6], fragNum)
|
||||
binary.BigEndian.PutUint16(body[6:8], totalFragments)
|
||||
copy(body[8:], iv)
|
||||
copy(body[8+len(iv):], ciphertext)
|
||||
|
||||
fragHeader := header
|
||||
fragHeader.NextPayload = payloadEncryptedFragment
|
||||
packet := fragHeader.marshal(body)
|
||||
checksum, err := integrityMAC(suite, integrityKey, packet[:len(packet)-checksumLength])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
copy(packet[len(packet)-checksumLength:], checksum)
|
||||
packets = append(packets, packet)
|
||||
}
|
||||
return packets, nil
|
||||
}
|
||||
|
||||
func decryptSingleFragment(
|
||||
packet []byte,
|
||||
suite negotiatedSuite,
|
||||
encryptionKey []byte,
|
||||
integrityKey []byte,
|
||||
) (ikeHeader, uint8, uint16, uint16, []byte, error) {
|
||||
header, body, err := parseIKEPacket(packet)
|
||||
if err != nil {
|
||||
return ikeHeader{}, 0, 0, 0, nil, err
|
||||
}
|
||||
if header.NextPayload != payloadEncryptedFragment || len(body) < 8 {
|
||||
return ikeHeader{}, 0, 0, 0, nil, fmt.Errorf("%w: message is not an encrypted IKE fragment", errUnexpectedPacket)
|
||||
}
|
||||
skfLength := int(binary.BigEndian.Uint16(body[2:4]))
|
||||
if skfLength != len(body) {
|
||||
return ikeHeader{}, 0, 0, 0, nil, fmt.Errorf("%w: encrypted fragment length mismatch", errMalformedPacket)
|
||||
}
|
||||
block, err := aes.NewCipher(encryptionKey)
|
||||
if err != nil {
|
||||
return ikeHeader{}, 0, 0, 0, nil, fmt.Errorf("ike: initialize AES: %w", err)
|
||||
}
|
||||
_, checksumLength, err := suite.integrityLengths()
|
||||
if err != nil {
|
||||
return ikeHeader{}, 0, 0, 0, nil, err
|
||||
}
|
||||
if len(body) < 8+block.BlockSize()+block.BlockSize()+checksumLength {
|
||||
return ikeHeader{}, 0, 0, 0, nil, fmt.Errorf("%w: encrypted fragment is too short", errMalformedPacket)
|
||||
}
|
||||
expected, err := integrityMAC(suite, integrityKey, packet[:len(packet)-checksumLength])
|
||||
if err != nil {
|
||||
return ikeHeader{}, 0, 0, 0, nil, err
|
||||
}
|
||||
actual := packet[len(packet)-checksumLength:]
|
||||
if subtle.ConstantTimeCompare(actual, expected) != 1 {
|
||||
return ikeHeader{}, 0, 0, 0, nil, errIntegrityMismatch
|
||||
}
|
||||
|
||||
fragNext := body[0]
|
||||
fragNum := binary.BigEndian.Uint16(body[4:6])
|
||||
totalFrags := binary.BigEndian.Uint16(body[6:8])
|
||||
if fragNum == 0 || totalFrags == 0 || fragNum > totalFrags {
|
||||
return ikeHeader{}, 0, 0, 0, nil, fmt.Errorf("%w: invalid fragment numbers %d/%d", errMalformedPacket, fragNum, totalFrags)
|
||||
}
|
||||
|
||||
ivStart := 8
|
||||
ciphertextStart := ivStart + block.BlockSize()
|
||||
ciphertextEnd := len(body) - checksumLength
|
||||
ciphertext := body[ciphertextStart:ciphertextEnd]
|
||||
if len(ciphertext) == 0 || len(ciphertext)%block.BlockSize() != 0 {
|
||||
return ikeHeader{}, 0, 0, 0, nil, fmt.Errorf("%w: fragment ciphertext is not block aligned", errMalformedPacket)
|
||||
}
|
||||
plaintext := make([]byte, len(ciphertext))
|
||||
cipher.NewCBCDecrypter(block, body[ivStart:ciphertextStart]).CryptBlocks(plaintext, ciphertext)
|
||||
paddingLength := int(plaintext[len(plaintext)-1])
|
||||
if paddingLength+1 > len(plaintext) {
|
||||
return ikeHeader{}, 0, 0, 0, nil, fmt.Errorf("%w: invalid encrypted fragment padding", errMalformedPacket)
|
||||
}
|
||||
plaintext = plaintext[:len(plaintext)-paddingLength-1]
|
||||
return header, fragNext, fragNum, totalFrags, plaintext, nil
|
||||
}
|
||||
|
||||
func decryptPayloadsAny(
|
||||
packet []byte,
|
||||
fragments [][]byte,
|
||||
suite negotiatedSuite,
|
||||
encryptionKey []byte,
|
||||
integrityKey []byte,
|
||||
) (ikeHeader, []payload, error) {
|
||||
if len(fragments) > 0 {
|
||||
var (
|
||||
firstHeader ikeHeader
|
||||
firstNext uint8
|
||||
totalExpected uint16
|
||||
plaintexts = make(map[uint16][]byte)
|
||||
)
|
||||
for _, fragPacket := range fragments {
|
||||
hdr, next, num, total, plain, err := decryptSingleFragment(fragPacket, suite, encryptionKey, integrityKey)
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
if totalExpected == 0 {
|
||||
firstHeader = hdr
|
||||
totalExpected = total
|
||||
} else if total != totalExpected || hdr.MessageID != firstHeader.MessageID || hdr.Exchange != firstHeader.Exchange {
|
||||
return ikeHeader{}, nil, fmt.Errorf("%w: inconsistent fragment headers", errMalformedPacket)
|
||||
}
|
||||
if num == 1 {
|
||||
firstNext = next
|
||||
}
|
||||
plaintexts[num] = plain
|
||||
}
|
||||
if uint16(len(plaintexts)) != totalExpected {
|
||||
return ikeHeader{}, nil, fmt.Errorf("%w: missing fragments: received %d of %d", errMalformedPacket, len(plaintexts), totalExpected)
|
||||
}
|
||||
var fullPlaintext []byte
|
||||
for i := uint16(1); i <= totalExpected; i++ {
|
||||
chunk, ok := plaintexts[i]
|
||||
if !ok {
|
||||
return ikeHeader{}, nil, fmt.Errorf("%w: missing fragment %d", errMalformedPacket, i)
|
||||
}
|
||||
fullPlaintext = append(fullPlaintext, chunk...)
|
||||
}
|
||||
payloads, err := parsePayloadChain(firstNext, fullPlaintext)
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
return firstHeader, payloads, nil
|
||||
}
|
||||
|
||||
header, _, err := parseIKEPacket(packet)
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
if header.NextPayload == payloadEncryptedFragment {
|
||||
hdr, next, num, total, plain, err := decryptSingleFragment(packet, suite, encryptionKey, integrityKey)
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
if num != 1 || total != 1 {
|
||||
return ikeHeader{}, nil, fmt.Errorf("%w: standalone fragment with total=%d", errMalformedPacket, total)
|
||||
}
|
||||
payloads, err := parsePayloadChain(next, plain)
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
return hdr, payloads, nil
|
||||
}
|
||||
return decryptPayloads(packet, suite, encryptionKey, integrityKey)
|
||||
}
|
||||
|
||||
var modpPrimes = map[uint16]string{
|
||||
dhMODP1024: "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" +
|
||||
"29024E088A67CC74020BBEA63B139B22514A08798E3404DD" +
|
||||
|
||||
@@ -113,3 +113,80 @@ func TestIKEKeyDerivationSeparatesDirections(t *testing.T) {
|
||||
t.Fatal("initiator and responder keys were not separated")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRFC7383FragmentationAndReassembly(t *testing.T) {
|
||||
suite := legacyTestSuite()
|
||||
encryptionKey := bytes.Repeat([]byte{0x11}, 16)
|
||||
integrityKey := bytes.Repeat([]byte{0x22}, 20)
|
||||
header := ikeHeader{
|
||||
InitiatorSPI: [8]byte{1, 2, 3, 4, 5, 6, 7, 8},
|
||||
ResponderSPI: [8]byte{8, 7, 6, 5, 4, 3, 2, 1},
|
||||
Exchange: exchangeIKEAuth,
|
||||
Flags: flagInitiator,
|
||||
MessageID: 9,
|
||||
}
|
||||
|
||||
largeCertData := bytes.Repeat([]byte{0xAB, 0xCD, 0xEF, 0x01}, 400) // 1600 bytes
|
||||
inner := []payload{
|
||||
{Type: payloadIDi, Body: []byte{3, 0, 0, 0, 'u', 's', 'e', 'r'}},
|
||||
{Type: payloadCert, Body: largeCertData},
|
||||
{Type: payloadAuth, Body: bytes.Repeat([]byte{0x55}, 64)},
|
||||
}
|
||||
|
||||
// Fragment into chunks with max fragment size 600 bytes
|
||||
packets, err := encryptPayloadsFragmented(
|
||||
header,
|
||||
inner,
|
||||
suite,
|
||||
encryptionKey,
|
||||
integrityKey,
|
||||
600,
|
||||
bytes.NewReader(bytes.Repeat([]byte{0x77}, 1024)),
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("encryptPayloadsFragmented() error = %v", err)
|
||||
}
|
||||
|
||||
if len(packets) < 3 {
|
||||
t.Fatalf("expected at least 3 fragments for large payload, got %d", len(packets))
|
||||
}
|
||||
|
||||
for i, pkt := range packets {
|
||||
hdr, body, parseErr := parseIKEPacket(pkt)
|
||||
if parseErr != nil {
|
||||
t.Fatalf("fragment %d parse error: %v", i+1, parseErr)
|
||||
}
|
||||
if hdr.NextPayload != payloadEncryptedFragment {
|
||||
t.Fatalf("fragment %d NextPayload = %d, want %d (payloadEncryptedFragment)", i+1, hdr.NextPayload, payloadEncryptedFragment)
|
||||
}
|
||||
if len(body) < 8 {
|
||||
t.Fatalf("fragment %d body too short", i+1)
|
||||
}
|
||||
}
|
||||
|
||||
// Decrypt and reassemble
|
||||
decodedHeader, decoded, err := decryptPayloadsAny(nil, packets, suite, encryptionKey, integrityKey)
|
||||
if err != nil {
|
||||
t.Fatalf("decryptPayloadsAny() error = %v", err)
|
||||
}
|
||||
|
||||
if decodedHeader.MessageID != header.MessageID || len(decoded) != len(inner) {
|
||||
t.Fatalf("reassembled payload mismatch: header=%#v, count=%d, want=%d", decodedHeader, len(decoded), len(inner))
|
||||
}
|
||||
|
||||
for index := range inner {
|
||||
if decoded[index].Type != inner[index].Type || !bytes.Equal(decoded[index].Body, inner[index].Body) {
|
||||
t.Fatalf("decoded payload %d = %#v, want %#v", index, decoded[index], inner[index])
|
||||
}
|
||||
}
|
||||
|
||||
// Test tamper detection on second fragment
|
||||
tamperedPackets := make([][]byte, len(packets))
|
||||
for i := range packets {
|
||||
tamperedPackets[i] = append([]byte(nil), packets[i]...)
|
||||
}
|
||||
tamperedPackets[1][len(tamperedPackets[1])-1] ^= 0x55
|
||||
if _, _, err := decryptPayloadsAny(nil, tamperedPackets, suite, encryptionKey, integrityKey); !errors.Is(err, errIntegrityMismatch) {
|
||||
t.Fatalf("tampered fragment decrypt error = %v, want errIntegrityMismatch", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -264,8 +264,13 @@ func permanentAKAIdentity(identity vowifi.SIMIdentity) ([]byte, error) {
|
||||
return nil, errors.New("ike: IMSI contains a non-digit")
|
||||
}
|
||||
}
|
||||
mcc := strings.TrimSpace(identity.HomeMCC)
|
||||
mnc := strings.TrimSpace(identity.HomeMNC)
|
||||
profile := vowifi.ResolveCarrierProfile(identity)
|
||||
mcc := strings.TrimSpace(profile.RouteMCC)
|
||||
mnc := strings.TrimSpace(profile.RouteMNC)
|
||||
if mcc == "" || mnc == "" {
|
||||
mcc = strings.TrimSpace(identity.HomeMCC)
|
||||
mnc = strings.TrimSpace(identity.HomeMNC)
|
||||
}
|
||||
if len(mcc) != 3 || (len(mnc) != 2 && len(mnc) != 3) {
|
||||
return nil, errors.New("ike: explicit home MCC/MNC is required for EAP-AKA")
|
||||
}
|
||||
|
||||
@@ -29,21 +29,28 @@ func resolveEPDG(ctx context.Context, resolver *net.Resolver, host string) ([]ne
|
||||
resolver = net.DefaultResolver
|
||||
}
|
||||
normalized := strings.ToLower(strings.TrimSuffix(strings.TrimSpace(host), "."))
|
||||
addresses, systemErr := resolver.LookupIPAddr(ctx, host)
|
||||
validSystemAddresses := filterValidPublicEPDGAddresses(addresses)
|
||||
if systemErr == nil && len(validSystemAddresses) > 0 {
|
||||
return validSystemAddresses, nil
|
||||
hostsToTry := []string{normalized}
|
||||
if alt := alternate3GPPHostname(normalized); alt != "" && alt != normalized {
|
||||
hostsToTry = append(hostsToTry, alt)
|
||||
}
|
||||
|
||||
var systemErr error
|
||||
for _, targetHost := range hostsToTry {
|
||||
addresses, err := resolver.LookupIPAddr(ctx, targetHost)
|
||||
if err == nil {
|
||||
valid := filterValidPublicEPDGAddresses(addresses)
|
||||
if len(valid) > 0 {
|
||||
return valid, nil
|
||||
}
|
||||
} else {
|
||||
systemErr = err
|
||||
}
|
||||
}
|
||||
|
||||
subnet := vowifi.EPDGDNSClientSubnet(normalized)
|
||||
client := &http.Client{Timeout: 8 * time.Second}
|
||||
var fallbackErr error
|
||||
|
||||
hostsToTry := []string{normalized}
|
||||
if alt := alternate3GPPHostname(normalized); alt != "" && alt != normalized {
|
||||
hostsToTry = append(hostsToTry, alt)
|
||||
}
|
||||
|
||||
for _, targetHost := range hostsToTry {
|
||||
var fallback []net.IPAddr
|
||||
fallback, fallbackErr = resolveEPDGWithECS(ctx, client, googleDNSOverHTTPS, targetHost, subnet)
|
||||
|
||||
+103
-32
@@ -187,6 +187,7 @@ func (provider *Provider) start(ctx context.Context, request vowifi.TunnelReques
|
||||
{Type: payloadNonce, Body: initiatorNonce},
|
||||
makeNotify(notifyNATSource, sourceHash),
|
||||
makeNotify(notifyNATDestination, destinationHash),
|
||||
makeNotify(notifyFragmentationSupported, nil),
|
||||
}
|
||||
var (
|
||||
initRequest []byte
|
||||
@@ -243,6 +244,7 @@ func (provider *Provider) start(ctx context.Context, request vowifi.TunnelReques
|
||||
}
|
||||
break
|
||||
}
|
||||
peerSupportsFragmentation := hasNotifyType(initResponsePayloads, notifyFragmentationSupported)
|
||||
saPayload, err := onePayload(initResponsePayloads, payloadSA)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -345,21 +347,19 @@ func (provider *Provider) start(ctx context.Context, request vowifi.TunnelReques
|
||||
Flags: flagInitiator,
|
||||
MessageID: 1,
|
||||
}
|
||||
authRequest, err := encryptPayloads(authHeader, firstAuthPayloads, ikeSuite, keys.SKei, keys.SKai, provider.config.Random)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
authResponse, err := transport.RoundTrip(ctx, authRequest)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
authResponseHeader, authResponsePayloads, err := decryptAndValidate(
|
||||
authResponse, initiatorSPI, responseHeader.ResponderSPI, exchangeIKEAuth, 1, ikeSuite, keys,
|
||||
_, authResponsePayloads, err := sendAndReceiveIKEPayloads(
|
||||
ctx,
|
||||
transport,
|
||||
authHeader,
|
||||
firstAuthPayloads,
|
||||
ikeSuite,
|
||||
keys,
|
||||
peerSupportsFragmentation,
|
||||
provider.config.Random,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_ = authResponseHeader
|
||||
serverName := strings.TrimSpace(provider.config.ServerName)
|
||||
if serverName == "" {
|
||||
serverName = epdg
|
||||
@@ -409,27 +409,27 @@ func (provider *Provider) start(ctx context.Context, request vowifi.TunnelReques
|
||||
requestPayloads = append(requestPayloads, deviceIdentity)
|
||||
}
|
||||
}
|
||||
eapRequest, err := encryptPayloads(ikeHeader{
|
||||
eapHeader := ikeHeader{
|
||||
InitiatorSPI: initiatorSPI,
|
||||
ResponderSPI: responseHeader.ResponderSPI,
|
||||
Exchange: exchangeIKEAuth,
|
||||
Flags: flagInitiator,
|
||||
MessageID: messageID,
|
||||
}, requestPayloads, ikeSuite, keys.SKei, keys.SKai, provider.config.Random)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if requested, notifyErr := deviceIdentityRequested(currentPayloads); notifyErr != nil {
|
||||
return nil, notifyErr
|
||||
} else if requested {
|
||||
deviceIdentityPending = true
|
||||
}
|
||||
eapResponse, err := transport.RoundTrip(ctx, eapRequest)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, currentPayloads, err = decryptAndValidate(
|
||||
eapResponse, initiatorSPI, responseHeader.ResponderSPI, exchangeIKEAuth, messageID, ikeSuite, keys,
|
||||
_, currentPayloads, err = sendAndReceiveIKEPayloads(
|
||||
ctx,
|
||||
transport,
|
||||
eapHeader,
|
||||
requestPayloads,
|
||||
ikeSuite,
|
||||
keys,
|
||||
peerSupportsFragmentation,
|
||||
provider.config.Random,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -454,22 +454,22 @@ func (provider *Provider) start(ctx context.Context, request vowifi.TunnelReques
|
||||
}
|
||||
messageID++
|
||||
cleanupMessageID = messageID + 1
|
||||
finalRequest, err := encryptPayloads(ikeHeader{
|
||||
finalHeader := ikeHeader{
|
||||
InitiatorSPI: initiatorSPI,
|
||||
ResponderSPI: responseHeader.ResponderSPI,
|
||||
Exchange: exchangeIKEAuth,
|
||||
Flags: flagInitiator,
|
||||
MessageID: messageID,
|
||||
}, []payload{initiatorAUTH}, ikeSuite, keys.SKei, keys.SKai, provider.config.Random)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
finalResponse, err := transport.RoundTrip(ctx, finalRequest)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_, finalPayloads, err := decryptAndValidate(
|
||||
finalResponse, initiatorSPI, responseHeader.ResponderSPI, exchangeIKEAuth, messageID, ikeSuite, keys,
|
||||
_, finalPayloads, err := sendAndReceiveIKEPayloads(
|
||||
ctx,
|
||||
transport,
|
||||
finalHeader,
|
||||
[]payload{initiatorAUTH},
|
||||
ikeSuite,
|
||||
keys,
|
||||
peerSupportsFragmentation,
|
||||
provider.config.Random,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -763,7 +763,7 @@ func decryptAndValidate(
|
||||
suite negotiatedSuite,
|
||||
keys ikeKeys,
|
||||
) (ikeHeader, []payload, error) {
|
||||
header, payloads, err := decryptPayloads(packet, suite, keys.SKer, keys.SKar)
|
||||
header, payloads, err := decryptPayloadsAny(packet, nil, suite, keys.SKer, keys.SKar)
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
@@ -778,6 +778,77 @@ func decryptAndValidate(
|
||||
return header, payloads, nil
|
||||
}
|
||||
|
||||
func decryptAndValidateFragments(
|
||||
packets [][]byte,
|
||||
initiatorSPI [8]byte,
|
||||
responderSPI [8]byte,
|
||||
exchange uint8,
|
||||
messageID uint32,
|
||||
suite negotiatedSuite,
|
||||
keys ikeKeys,
|
||||
) (ikeHeader, []payload, error) {
|
||||
if len(packets) == 0 {
|
||||
return ikeHeader{}, nil, errors.New("ike: empty exchange response")
|
||||
}
|
||||
if len(packets) == 1 {
|
||||
return decryptAndValidate(packets[0], initiatorSPI, responderSPI, exchange, messageID, suite, keys)
|
||||
}
|
||||
header, payloads, err := decryptPayloadsAny(nil, packets, suite, keys.SKer, keys.SKar)
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
if header.InitiatorSPI != initiatorSPI ||
|
||||
header.ResponderSPI != responderSPI ||
|
||||
header.Exchange != exchange ||
|
||||
header.MessageID != messageID ||
|
||||
header.Flags&flagResponse == 0 ||
|
||||
header.Flags&flagInitiator != 0 {
|
||||
return ikeHeader{}, nil, fmt.Errorf("%w: encrypted response header does not match the request", errUnexpectedPacket)
|
||||
}
|
||||
return header, payloads, nil
|
||||
}
|
||||
|
||||
func sendAndReceiveIKEPayloads(
|
||||
ctx context.Context,
|
||||
transport datagramTransport,
|
||||
header ikeHeader,
|
||||
payloads []payload,
|
||||
suite negotiatedSuite,
|
||||
keys ikeKeys,
|
||||
peerSupportsFragmentation bool,
|
||||
random io.Reader,
|
||||
) (ikeHeader, []payload, error) {
|
||||
var outboundPackets [][]byte
|
||||
var err error
|
||||
if peerSupportsFragmentation {
|
||||
outboundPackets, err = encryptPayloadsFragmented(header, payloads, suite, keys.SKei, keys.SKai, defaultIKEFragmentSize, random)
|
||||
} else {
|
||||
pkt, encryptErr := encryptPayloads(header, payloads, suite, keys.SKei, keys.SKai, random)
|
||||
if encryptErr != nil {
|
||||
return ikeHeader{}, nil, encryptErr
|
||||
}
|
||||
outboundPackets = [][]byte{pkt}
|
||||
}
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
inboundPackets, err := transport.RoundTripExchange(ctx, outboundPackets)
|
||||
if err != nil {
|
||||
return ikeHeader{}, nil, err
|
||||
}
|
||||
return decryptAndValidateFragments(inboundPackets, header.InitiatorSPI, header.ResponderSPI, header.Exchange, header.MessageID, suite, keys)
|
||||
}
|
||||
|
||||
func hasNotifyType(payloads []payload, notifyType uint16) bool {
|
||||
for _, item := range payloadsOfType(payloads, payloadNotify) {
|
||||
kind, _, err := parseNotify(item)
|
||||
if err == nil && kind == notifyType {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
var errNoProposalChosen = errors.New("ike: responder reported NO_PROPOSAL_CHOSEN")
|
||||
|
||||
type invalidKEPayloadError struct {
|
||||
|
||||
@@ -76,7 +76,7 @@ func (transport *firstAuthCaptureTransport) Float(context.Context) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (transport *firstAuthCaptureTransport) RoundTrip(_ context.Context, packet []byte) ([]byte, error) {
|
||||
func (transport *firstAuthCaptureTransport) RoundTrip(ctx context.Context, packet []byte) ([]byte, error) {
|
||||
transport.calls++
|
||||
if len(transport.cookieChallenge) > 0 {
|
||||
switch transport.calls {
|
||||
@@ -106,6 +106,17 @@ func (transport *firstAuthCaptureTransport) RoundTrip(_ context.Context, packet
|
||||
}
|
||||
}
|
||||
|
||||
func (transport *firstAuthCaptureTransport) RoundTripExchange(ctx context.Context, packets [][]byte) ([][]byte, error) {
|
||||
if len(packets) == 0 {
|
||||
return nil, errors.New("test: empty outbound packets")
|
||||
}
|
||||
resp, err := transport.RoundTrip(ctx, packets[0])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return [][]byte{resp}, nil
|
||||
}
|
||||
|
||||
func (transport *firstAuthCaptureTransport) answerIKECookie(packet []byte) ([]byte, error) {
|
||||
header, _, err := parseIKEPacket(packet)
|
||||
if err != nil {
|
||||
@@ -146,8 +157,8 @@ func (transport *firstAuthCaptureTransport) verifyIKECookie(packet []byte) error
|
||||
return errors.New("test: first retried IKE_SA_INIT payload is not the expected COOKIE")
|
||||
}
|
||||
cookies := payloadsOfType(payloads, payloadNotify)
|
||||
if len(cookies) != 3 {
|
||||
return fmt.Errorf("test: retried IKE_SA_INIT has %d notify payloads, want 3", len(cookies))
|
||||
if len(cookies) != 4 {
|
||||
return fmt.Errorf("test: retried IKE_SA_INIT has %d notify payloads, want 4", len(cookies))
|
||||
}
|
||||
found := false
|
||||
for _, item := range cookies {
|
||||
|
||||
@@ -39,7 +39,7 @@ func newSessionRelay(
|
||||
keepalive time.Duration,
|
||||
) *sessionRelay {
|
||||
if keepalive <= 0 {
|
||||
keepalive = 20 * time.Second
|
||||
keepalive = 15 * time.Second
|
||||
}
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
relay := &sessionRelay{
|
||||
|
||||
@@ -3,6 +3,7 @@ package ike
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"errors"
|
||||
"net"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
@@ -49,6 +50,16 @@ func (*fakeSessionTransport) Float(context.Context) error { return nil }
|
||||
func (*fakeSessionTransport) RoundTrip(context.Context, []byte) ([]byte, error) {
|
||||
return nil, context.DeadlineExceeded
|
||||
}
|
||||
func (t *fakeSessionTransport) RoundTripExchange(ctx context.Context, packets [][]byte) ([][]byte, error) {
|
||||
if len(packets) == 0 {
|
||||
return nil, errors.New("empty outbound packets")
|
||||
}
|
||||
resp, err := t.RoundTrip(ctx, packets[0])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return [][]byte{resp}, nil
|
||||
}
|
||||
func (transport *fakeSessionTransport) SendESP(ctx context.Context, packet []byte) error {
|
||||
return transport.SendSessionPacket(ctx, packet, false)
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ type datagramTransport interface {
|
||||
RemoteAddr() *net.UDPAddr
|
||||
Float(context.Context) error
|
||||
RoundTrip(context.Context, []byte) ([]byte, error)
|
||||
RoundTripExchange(context.Context, [][]byte) ([][]byte, error)
|
||||
SendESP(context.Context, []byte) error
|
||||
ReceiveESP(context.Context, []byte) (int, error)
|
||||
SendSessionPacket(context.Context, []byte, bool) error
|
||||
@@ -96,6 +97,29 @@ func roundTripDatagram(
|
||||
read func([]byte, time.Time) (int, error),
|
||||
packet []byte,
|
||||
) ([]byte, error) {
|
||||
writeAll := func(values [][]byte) error {
|
||||
if len(values) > 0 {
|
||||
return write(values[0])
|
||||
}
|
||||
return nil
|
||||
}
|
||||
responses, err := roundTripFragments(ctx, timeout, writeAll, read, [][]byte{packet})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(responses) == 0 {
|
||||
return nil, errors.New("ike: empty datagram response")
|
||||
}
|
||||
return responses[0], nil
|
||||
}
|
||||
|
||||
func roundTripFragments(
|
||||
ctx context.Context,
|
||||
timeout time.Duration,
|
||||
writeAll func([][]byte) error,
|
||||
read func([]byte, time.Time) (int, error),
|
||||
packets [][]byte,
|
||||
) ([][]byte, error) {
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
@@ -110,20 +134,44 @@ func roundTripDatagram(
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := write(packet); err != nil {
|
||||
if err := writeAll(packets); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
attemptDeadline := time.Now().Add(interval)
|
||||
if deadline.Before(attemptDeadline) {
|
||||
attemptDeadline = deadline
|
||||
}
|
||||
var (
|
||||
totalExpected uint16
|
||||
fragments = make(map[uint16][]byte)
|
||||
)
|
||||
for time.Now().Before(attemptDeadline) {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
n, err := read(buffer, attemptDeadline)
|
||||
if err == nil {
|
||||
return append([]byte(nil), buffer[:n]...), nil
|
||||
pkt := append([]byte(nil), buffer[:n]...)
|
||||
header, body, parseErr := parseIKEPacket(pkt)
|
||||
if parseErr == nil && header.NextPayload == payloadEncryptedFragment && len(body) >= 8 {
|
||||
fragNum := binary.BigEndian.Uint16(body[4:6])
|
||||
total := binary.BigEndian.Uint16(body[6:8])
|
||||
if total > 1 {
|
||||
if totalExpected == 0 {
|
||||
totalExpected = total
|
||||
}
|
||||
fragments[fragNum] = pkt
|
||||
if uint16(len(fragments)) == totalExpected {
|
||||
res := make([][]byte, 0, totalExpected)
|
||||
for i := uint16(1); i <= totalExpected; i++ {
|
||||
res = append(res, fragments[i])
|
||||
}
|
||||
return res, nil
|
||||
}
|
||||
continue
|
||||
}
|
||||
}
|
||||
return [][]byte{pkt}, nil
|
||||
}
|
||||
if timeoutError, ok := err.(net.Error); ok && timeoutError.Timeout() {
|
||||
lastErr = err
|
||||
@@ -222,25 +270,47 @@ func (transport *directUDP) Float(ctx context.Context) error {
|
||||
}
|
||||
|
||||
func (transport *directUDP) RoundTrip(ctx context.Context, packet []byte) ([]byte, error) {
|
||||
responses, err := transport.RoundTripExchange(ctx, [][]byte{packet})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(responses) == 0 {
|
||||
return nil, errors.New("ike: empty exchange response")
|
||||
}
|
||||
return responses[0], nil
|
||||
}
|
||||
|
||||
func (transport *directUDP) RoundTripExchange(ctx context.Context, packets [][]byte) ([][]byte, error) {
|
||||
transport.mu.Lock()
|
||||
defer transport.mu.Unlock()
|
||||
if transport.conn == nil {
|
||||
return nil, errors.New("ike: UDP transport is closed")
|
||||
}
|
||||
requestHeader, _, err := parseIKEPacket(packet)
|
||||
if len(packets) == 0 {
|
||||
return nil, errors.New("ike: outbound packet list is empty")
|
||||
}
|
||||
requestHeader, _, err := parseIKEPacket(packets[0])
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("ike: invalid outbound packet: %w", err)
|
||||
}
|
||||
wirePacket := packet
|
||||
if transport.floated {
|
||||
wirePacket = append([]byte{0, 0, 0, 0}, packet...)
|
||||
}
|
||||
write := func(value []byte) error {
|
||||
if err := transport.conn.SetWriteDeadline(deadlineFor(ctx, transport.config.Timeout)); err != nil {
|
||||
return err
|
||||
var wirePackets [][]byte
|
||||
for _, pkt := range packets {
|
||||
wire := pkt
|
||||
if transport.floated {
|
||||
wire = append([]byte{0, 0, 0, 0}, pkt...)
|
||||
}
|
||||
_, err := transport.conn.Write(value)
|
||||
return err
|
||||
wirePackets = append(wirePackets, wire)
|
||||
}
|
||||
writeAll := func(values [][]byte) error {
|
||||
for _, value := range values {
|
||||
if err := transport.conn.SetWriteDeadline(deadlineFor(ctx, transport.config.Timeout)); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := transport.conn.Write(value); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
read := func(buffer []byte, attemptDeadline time.Time) (int, error) {
|
||||
for {
|
||||
@@ -252,10 +322,6 @@ func (transport *directUDP) RoundTrip(ctx context.Context, packet []byte) ([]byt
|
||||
return 0, err
|
||||
}
|
||||
if transport.floated {
|
||||
// IKE and ESP legitimately share UDP/4500. An ESP packet can
|
||||
// arrive immediately before the IKE response that completes
|
||||
// CHILD_SA setup; discard it here and keep the same absolute
|
||||
// attempt deadline while waiting for marked IKE.
|
||||
if !hasNonESPMarker(buffer[:n]) {
|
||||
continue
|
||||
}
|
||||
@@ -268,7 +334,7 @@ func (transport *directUDP) RoundTrip(ctx context.Context, packet []byte) ([]byt
|
||||
return n, nil
|
||||
}
|
||||
}
|
||||
return roundTripDatagram(ctx, transport.config.Timeout, write, read, wirePacket)
|
||||
return roundTripFragments(ctx, transport.config.Timeout, writeAll, read, wirePackets)
|
||||
}
|
||||
|
||||
func (transport *directUDP) SendESP(ctx context.Context, packet []byte) error {
|
||||
@@ -561,12 +627,26 @@ func (transport *socks5UDP) Float(_ context.Context) error {
|
||||
}
|
||||
|
||||
func (transport *socks5UDP) RoundTrip(ctx context.Context, packet []byte) ([]byte, error) {
|
||||
responses, err := transport.RoundTripExchange(ctx, [][]byte{packet})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(responses) == 0 {
|
||||
return nil, errors.New("ike: empty exchange response")
|
||||
}
|
||||
return responses[0], nil
|
||||
}
|
||||
|
||||
func (transport *socks5UDP) RoundTripExchange(ctx context.Context, packets [][]byte) ([][]byte, error) {
|
||||
transport.mu.Lock()
|
||||
defer transport.mu.Unlock()
|
||||
if transport.udp == nil {
|
||||
return nil, errors.New("ike: SOCKS5 UDP transport is closed")
|
||||
}
|
||||
requestHeader, _, err := parseIKEPacket(packet)
|
||||
if len(packets) == 0 {
|
||||
return nil, errors.New("ike: outbound packet list is empty")
|
||||
}
|
||||
requestHeader, _, err := parseIKEPacket(packets[0])
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("ike: invalid outbound packet: %w", err)
|
||||
}
|
||||
@@ -576,18 +656,18 @@ func (transport *socks5UDP) RoundTrip(ctx context.Context, packet []byte) ([]byt
|
||||
// Once a gateway answers, keep it pinned for the lifetime of the IKE SA.
|
||||
if !transport.floated && requestHeader.Exchange == exchangeIKEInit && requestHeader.MessageID == 0 && len(transport.remotes) > 1 {
|
||||
var lastErr error
|
||||
var cookieResponse []byte
|
||||
var cookieResponse [][]byte
|
||||
for _, candidate := range transport.remotes {
|
||||
transport.remote = cloneUDPAddr(candidate)
|
||||
response, attemptErr := transport.roundTripLocked(ctx, packet, requestHeader)
|
||||
responses, attemptErr := transport.roundTripFragmentsLocked(ctx, packets, requestHeader)
|
||||
if attemptErr == nil {
|
||||
if ikeInitResponseHasCookie(response) {
|
||||
if len(responses) > 0 && ikeInitResponseHasCookie(responses[0]) {
|
||||
if cookieResponse == nil {
|
||||
cookieResponse = append([]byte(nil), response...)
|
||||
cookieResponse = responses
|
||||
}
|
||||
continue
|
||||
}
|
||||
return response, nil
|
||||
return responses, nil
|
||||
}
|
||||
lastErr = attemptErr
|
||||
if ctx.Err() != nil || !isNetworkTimeout(attemptErr) {
|
||||
@@ -599,24 +679,32 @@ func (transport *socks5UDP) RoundTrip(ctx context.Context, packet []byte) ([]byt
|
||||
}
|
||||
return nil, fmt.Errorf("ike: all %d resolved ePDG addresses timed out: %w", len(transport.remotes), lastErr)
|
||||
}
|
||||
return transport.roundTripLocked(ctx, packet, requestHeader)
|
||||
return transport.roundTripFragmentsLocked(ctx, packets, requestHeader)
|
||||
}
|
||||
|
||||
func (transport *socks5UDP) roundTripLocked(ctx context.Context, packet []byte, requestHeader ikeHeader) ([]byte, error) {
|
||||
wireIKE := packet
|
||||
if transport.floated {
|
||||
wireIKE = append([]byte{0, 0, 0, 0}, packet...)
|
||||
}
|
||||
datagram, err := marshalSOCKS5Datagram(transport.remote, wireIKE)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
write := func(value []byte) error {
|
||||
if err := transport.udp.SetWriteDeadline(deadlineFor(ctx, transport.config.Timeout)); err != nil {
|
||||
return err
|
||||
func (transport *socks5UDP) roundTripFragmentsLocked(ctx context.Context, packets [][]byte, requestHeader ikeHeader) ([][]byte, error) {
|
||||
var datagrams [][]byte
|
||||
for _, pkt := range packets {
|
||||
wireIKE := pkt
|
||||
if transport.floated {
|
||||
wireIKE = append([]byte{0, 0, 0, 0}, pkt...)
|
||||
}
|
||||
_, err := transport.udp.Write(value)
|
||||
return err
|
||||
datagram, err := marshalSOCKS5Datagram(transport.remote, wireIKE)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
datagrams = append(datagrams, datagram)
|
||||
}
|
||||
writeAll := func(values [][]byte) error {
|
||||
for _, value := range values {
|
||||
if err := transport.udp.SetWriteDeadline(deadlineFor(ctx, transport.config.Timeout)); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := transport.udp.Write(value); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
read := func(buffer []byte, attemptDeadline time.Time) (int, error) {
|
||||
for {
|
||||
@@ -630,10 +718,6 @@ func (transport *socks5UDP) roundTripLocked(ctx context.Context, packet []byte,
|
||||
return 0, err
|
||||
}
|
||||
if transport.floated {
|
||||
// The relay can deliver ESP before the marked IKE response on
|
||||
// the same UDP/4500 association. Do not accept it as IKE, and
|
||||
// do not abort the exchange; keep waiting within the original
|
||||
// deadline.
|
||||
if !hasNonESPMarker(payload) {
|
||||
continue
|
||||
}
|
||||
@@ -646,7 +730,7 @@ func (transport *socks5UDP) roundTripLocked(ctx context.Context, packet []byte,
|
||||
return len(payload), nil
|
||||
}
|
||||
}
|
||||
return roundTripDatagram(ctx, transport.config.Timeout, write, read, datagram)
|
||||
return roundTripFragments(ctx, transport.config.Timeout, writeAll, read, datagrams)
|
||||
}
|
||||
|
||||
func isNetworkTimeout(err error) bool {
|
||||
|
||||
+14
-12
@@ -31,9 +31,10 @@ const (
|
||||
payloadDelete = 42
|
||||
payloadTSi = 44
|
||||
payloadTSr = 45
|
||||
payloadEncrypted = 46
|
||||
payloadCP = 47
|
||||
payloadEAP = 48
|
||||
payloadEncrypted = 46
|
||||
payloadCP = 47
|
||||
payloadEAP = 48
|
||||
payloadEncryptedFragment = 53
|
||||
|
||||
protocolIKE = 1
|
||||
protocolESP = 3
|
||||
@@ -55,15 +56,16 @@ const (
|
||||
dhMODP2048 = 14
|
||||
transformAttributeKeyLen = 14
|
||||
|
||||
notifyInitialContact = 16384
|
||||
notifyMOBIKESupported = 16396
|
||||
notifyNATSource = 16388
|
||||
notifyNATDestination = 16389
|
||||
notifyCookie = 16390
|
||||
notifyEAPOnlyAuth = 16417
|
||||
notifyDeviceIdentity = 41101
|
||||
notifyInvalidKE = 17
|
||||
notifyNoProposal = 14
|
||||
notifyInitialContact = 16384
|
||||
notifyMOBIKESupported = 16396
|
||||
notifyNATSource = 16388
|
||||
notifyNATDestination = 16389
|
||||
notifyCookie = 16390
|
||||
notifyEAPOnlyAuth = 16417
|
||||
notifyFragmentationSupported = 16430
|
||||
notifyDeviceIdentity = 41101
|
||||
notifyInvalidKE = 17
|
||||
notifyNoProposal = 14
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -230,99 +230,109 @@ func (provider *Provider) Start(ctx context.Context, request vowifi.IMSRequest)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
pcscf := provider.config.PCSCF
|
||||
if pcscf == "" {
|
||||
var pcscfCandidates []string
|
||||
if provider.config.PCSCF != "" {
|
||||
pcscfCandidates = []string{provider.config.PCSCF}
|
||||
} else {
|
||||
for _, candidate := range tunnel.PCSCF {
|
||||
if strings.TrimSpace(candidate) != "" {
|
||||
pcscf = candidate
|
||||
break
|
||||
candidate = strings.TrimSpace(candidate)
|
||||
if candidate != "" {
|
||||
pcscfCandidates = append(pcscfCandidates, candidate)
|
||||
}
|
||||
}
|
||||
}
|
||||
if pcscf == "" {
|
||||
if len(pcscfCandidates) == 0 {
|
||||
return nil, errors.New("ims: tunnel did not provide a P-CSCF")
|
||||
}
|
||||
endpoint, transportHint, err := parsePCSCF(pcscf, provider.config.Port)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if provider.config.PCSCF != "" && !pcscfProvenByTunnel(endpoint, tunnel.PCSCF, provider.config.Port) {
|
||||
return nil, errors.New("ims: configured P-CSCF is not proven by the SWu tunnel")
|
||||
}
|
||||
transport, carrierSelected := carrierTransportForIdentity(provider.config, request.Identity)
|
||||
if cached := provider.cachedTransport(request.Identity); cached != "" {
|
||||
transport = cached
|
||||
carrierSelected = true
|
||||
}
|
||||
if transport == "" && !carrierSelected {
|
||||
transport = transportHint
|
||||
}
|
||||
if transport == "" {
|
||||
transport = provider.config.Transport
|
||||
}
|
||||
if transport == "" {
|
||||
transport = "tcp"
|
||||
}
|
||||
localAddress := provider.config.LocalAddress
|
||||
if localAddress == "" {
|
||||
if endpointIP := net.ParseIP(endpoint.host); endpointIP != nil && endpointIP.To4() == nil {
|
||||
localAddress = tunnel.LocalIPv6
|
||||
} else {
|
||||
localAddress = tunnel.LocalIPv4
|
||||
if strings.TrimSpace(localAddress) == "" {
|
||||
localAddress = tunnel.LocalIPv6
|
||||
}
|
||||
}
|
||||
}
|
||||
localAddress = strings.TrimSpace(strings.Split(localAddress, "/")[0])
|
||||
if localAddress == "" {
|
||||
return nil, errors.New("ims: tunnel did not provide a local address")
|
||||
}
|
||||
if !localAddressProvenByTunnel(localAddress, tunnel) {
|
||||
return nil, errors.New("ims: configured local address is not assigned by the SWu tunnel")
|
||||
}
|
||||
|
||||
transports := []string{transport}
|
||||
if provider.config.AutoTransportFallback {
|
||||
alternate := "udp"
|
||||
if transport == "udp" {
|
||||
alternate = "tcp"
|
||||
}
|
||||
transports = append(transports, alternate)
|
||||
}
|
||||
var lastErr error
|
||||
for attempt, candidate := range transports {
|
||||
connection, dialErr := dialSIP(ctx, candidate, localAddress, 0, endpoint.address())
|
||||
if dialErr != nil {
|
||||
lastErr = fmt.Errorf("ims: connect to P-CSCF over %s: %w", candidate, dialErr)
|
||||
if attempt+1 < len(transports) && ctx.Err() == nil {
|
||||
provider.logTransportFallback(request.Identity, candidate, transports[attempt+1], lastErr)
|
||||
continue
|
||||
for pcscfIndex, pcscf := range pcscfCandidates {
|
||||
endpoint, transportHint, err := parsePCSCF(pcscf, provider.config.Port)
|
||||
if err != nil {
|
||||
lastErr = err
|
||||
continue
|
||||
}
|
||||
if provider.config.PCSCF != "" && !pcscfProvenByTunnel(endpoint, tunnel.PCSCF, provider.config.Port) {
|
||||
return nil, errors.New("ims: configured P-CSCF is not proven by the SWu tunnel")
|
||||
}
|
||||
transport, carrierSelected := carrierTransportForIdentity(provider.config, request.Identity)
|
||||
if cached := provider.cachedTransport(request.Identity); cached != "" {
|
||||
transport = cached
|
||||
carrierSelected = true
|
||||
}
|
||||
if transport == "" && !carrierSelected {
|
||||
transport = transportHint
|
||||
}
|
||||
if transport == "" {
|
||||
transport = provider.config.Transport
|
||||
}
|
||||
if transport == "" {
|
||||
transport = "tcp"
|
||||
}
|
||||
localAddress := provider.config.LocalAddress
|
||||
if localAddress == "" {
|
||||
if endpointIP := net.ParseIP(endpoint.host); endpointIP != nil && endpointIP.To4() == nil {
|
||||
localAddress = tunnel.LocalIPv6
|
||||
} else {
|
||||
localAddress = tunnel.LocalIPv4
|
||||
if strings.TrimSpace(localAddress) == "" {
|
||||
localAddress = tunnel.LocalIPv6
|
||||
}
|
||||
}
|
||||
return nil, lastErr
|
||||
}
|
||||
session, sessionErr := newSession(provider, request, identities, endpoint, candidate, connection)
|
||||
if sessionErr != nil {
|
||||
_ = connection.Close()
|
||||
return nil, sessionErr
|
||||
localAddress = strings.TrimSpace(strings.Split(localAddress, "/")[0])
|
||||
if localAddress == "" {
|
||||
return nil, errors.New("ims: tunnel did not provide a local address")
|
||||
}
|
||||
establishErr := session.establish(ctx)
|
||||
if establishErr == nil {
|
||||
provider.rememberTransport(request.Identity, candidate)
|
||||
if attempt > 0 {
|
||||
provider.config.Logger.Info("IMS automatic transport fallback succeeded",
|
||||
"carrier_profile", vowifi.ResolveCarrierProfile(request.Identity).ID,
|
||||
"transport", candidate)
|
||||
if !localAddressProvenByTunnel(localAddress, tunnel) {
|
||||
return nil, errors.New("ims: configured local address is not assigned by the SWu tunnel")
|
||||
}
|
||||
|
||||
transports := []string{transport}
|
||||
if provider.config.AutoTransportFallback {
|
||||
alternate := "udp"
|
||||
if transport == "udp" {
|
||||
alternate = "tcp"
|
||||
}
|
||||
return session, nil
|
||||
transports = append(transports, alternate)
|
||||
}
|
||||
sipResponseObserved := session.evidence.LastSIPCode != 0
|
||||
session.abort()
|
||||
lastErr = establishErr
|
||||
if sipResponseObserved || attempt+1 >= len(transports) || ctx.Err() != nil {
|
||||
return nil, lastErr
|
||||
for attempt, candidate := range transports {
|
||||
connection, dialErr := dialSIP(ctx, candidate, localAddress, 0, endpoint.address())
|
||||
if dialErr != nil {
|
||||
lastErr = fmt.Errorf("ims: connect to P-CSCF over %s: %w", candidate, dialErr)
|
||||
if attempt+1 < len(transports) && ctx.Err() == nil {
|
||||
provider.logTransportFallback(request.Identity, candidate, transports[attempt+1], lastErr)
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
session, sessionErr := newSession(provider, request, identities, endpoint, candidate, connection)
|
||||
if sessionErr != nil {
|
||||
_ = connection.Close()
|
||||
lastErr = sessionErr
|
||||
break
|
||||
}
|
||||
establishErr := session.establish(ctx)
|
||||
if establishErr == nil {
|
||||
provider.rememberTransport(request.Identity, candidate)
|
||||
if attempt > 0 || pcscfIndex > 0 {
|
||||
provider.config.Logger.Info("IMS automatic transport fallback succeeded",
|
||||
"carrier_profile", vowifi.ResolveCarrierProfile(request.Identity).ID,
|
||||
"transport", candidate)
|
||||
}
|
||||
return session, nil
|
||||
}
|
||||
sipResponseObserved := session.evidence.LastSIPCode != 0
|
||||
session.abort()
|
||||
lastErr = establishErr
|
||||
if sipResponseObserved || attempt+1 >= len(transports) || ctx.Err() != nil {
|
||||
break
|
||||
}
|
||||
provider.logTransportFallback(request.Identity, candidate, transports[attempt+1], establishErr)
|
||||
}
|
||||
if ctx.Err() != nil {
|
||||
return nil, ctx.Err()
|
||||
}
|
||||
provider.logTransportFallback(request.Identity, candidate, transports[attempt+1], establishErr)
|
||||
}
|
||||
return nil, lastErr
|
||||
}
|
||||
@@ -384,8 +394,13 @@ func deriveIdentities(identity vowifi.SIMIdentity, config Config) (identitySet,
|
||||
if !digitsBetween(imsi, 5, 16) {
|
||||
return identitySet{}, errors.New("ims: SIM IMSI is unavailable or invalid")
|
||||
}
|
||||
mcc := strings.TrimSpace(identity.HomeMCC)
|
||||
mnc := strings.TrimSpace(identity.HomeMNC)
|
||||
profile := vowifi.ResolveCarrierProfile(identity)
|
||||
mcc := strings.TrimSpace(profile.RouteMCC)
|
||||
mnc := strings.TrimSpace(profile.RouteMNC)
|
||||
if mcc == "" || mnc == "" {
|
||||
mcc = strings.TrimSpace(identity.HomeMCC)
|
||||
mnc = strings.TrimSpace(identity.HomeMNC)
|
||||
}
|
||||
if !digitsBetween(mcc, 3, 3) || !digitsBetween(mnc, 2, 3) {
|
||||
return identitySet{}, errors.New("ims: home PLMN is unavailable or invalid")
|
||||
}
|
||||
@@ -395,7 +410,7 @@ func deriveIdentities(identity vowifi.SIMIdentity, config Config) (identitySet,
|
||||
domain := fmt.Sprintf("ims.mnc%s.mcc%s.3gppnetwork.org", mnc, mcc)
|
||||
privateDomain := domain
|
||||
publicDomain := domain
|
||||
if vowifi.ResolveCarrierProfile(identity).IMSIdentityProfile == vowifi.IMSProfileATT {
|
||||
if profile.IMSIdentityProfile == vowifi.IMSProfileATT {
|
||||
// AT&T provisions the IMPI and IMPU in its ISIM domains rather than
|
||||
// the generic 3GPP PLMN IMS domain.
|
||||
domain = "one.att.net"
|
||||
|
||||
@@ -71,7 +71,16 @@ func (media *rtpMedia) ready() bool {
|
||||
}
|
||||
|
||||
func (media *rtpMedia) offerSDP(local net.IP) []byte {
|
||||
return media.buildSDP(local, "8 0", nil)
|
||||
return media.buildSDP(local, "8 0 104 102 100", []string{
|
||||
"a=rtpmap:8 PCMA/8000",
|
||||
"a=rtpmap:0 PCMU/8000",
|
||||
"a=rtpmap:104 AMR-WB/16000",
|
||||
"a=fmtp:104 mode-change-capability=2;max-red=220",
|
||||
"a=rtpmap:102 AMR/8000",
|
||||
"a=fmtp:102 mode-change-capability=2;max-red=220",
|
||||
"a=rtpmap:100 telephone-event/8000",
|
||||
"a=fmtp:100 0-15",
|
||||
})
|
||||
}
|
||||
|
||||
func (media *rtpMedia) answerSDP(local net.IP) []byte {
|
||||
@@ -81,8 +90,12 @@ func (media *rtpMedia) answerSDP(local net.IP) []byte {
|
||||
if codec == "" {
|
||||
return media.offerSDP(local)
|
||||
}
|
||||
rate := 8000
|
||||
if codec == "AMR-WB" {
|
||||
rate = 16000
|
||||
}
|
||||
return media.buildSDP(local, strconv.Itoa(int(payload)), []string{
|
||||
fmt.Sprintf("a=rtpmap:%d %s/8000", payload, codec),
|
||||
fmt.Sprintf("a=rtpmap:%d %s/%d", payload, codec, rate),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -110,7 +123,16 @@ func (media *rtpMedia) buildSDP(local net.IP, formats string, attributes []strin
|
||||
fmt.Sprintf("m=audio %d RTP/AVP %s", port, formats),
|
||||
}
|
||||
if attributes == nil {
|
||||
lines = append(lines, "a=rtpmap:8 PCMA/8000", "a=rtpmap:0 PCMU/8000")
|
||||
lines = append(lines,
|
||||
"a=rtpmap:8 PCMA/8000",
|
||||
"a=rtpmap:0 PCMU/8000",
|
||||
"a=rtpmap:104 AMR-WB/16000",
|
||||
"a=fmtp:104 mode-change-capability=2;max-red=220",
|
||||
"a=rtpmap:102 AMR/8000",
|
||||
"a=fmtp:102 mode-change-capability=2;max-red=220",
|
||||
"a=rtpmap:100 telephone-event/8000",
|
||||
"a=fmtp:100 0-15",
|
||||
)
|
||||
} else {
|
||||
lines = append(lines, attributes...)
|
||||
}
|
||||
@@ -137,15 +159,24 @@ func (media *rtpMedia) configureRemote(body []byte) error {
|
||||
name = "PCMU"
|
||||
case 8:
|
||||
name = "PCMA"
|
||||
case 100:
|
||||
continue
|
||||
default:
|
||||
name = fmt.Sprintf("PAYLOAD-%d", parsed)
|
||||
}
|
||||
}
|
||||
if name == "PCMA" || name == "PCMU" {
|
||||
if name != "TELEPHONE-EVENT" {
|
||||
codec, payload = name, byte(parsed)
|
||||
break
|
||||
}
|
||||
}
|
||||
if codec == "" && len(formats) > 0 {
|
||||
if parsed, parseErr := strconv.Atoi(formats[0]); parseErr == nil {
|
||||
codec, payload = fmt.Sprintf("PAYLOAD-%d", parsed), byte(parsed)
|
||||
}
|
||||
}
|
||||
if codec == "" {
|
||||
return errors.New("ims: remote endpoint did not accept PCMA or PCMU audio")
|
||||
return errors.New("ims: remote SDP has no usable audio format")
|
||||
}
|
||||
media.mu.Lock()
|
||||
media.remote = &net.UDPAddr{IP: address, Port: port}
|
||||
|
||||
@@ -56,7 +56,6 @@ type ReceivedSMS struct {
|
||||
RawTPDU string
|
||||
DecodeError string
|
||||
}
|
||||
|
||||
// ReceivedSMSStatus is network delivery evidence for one submitted SMS part.
|
||||
type ReceivedSMSStatus struct {
|
||||
DeviceID string
|
||||
@@ -891,10 +890,8 @@ func (session *Session) parseUSSIReply(response *sipResponse) (string, *int) {
|
||||
}
|
||||
|
||||
func (session *Session) ussiTarget() string {
|
||||
if number, _, ok := vowifi.ExtractAssociatedMSISDN(session.evidence); ok {
|
||||
if normalized := normalizeE164(number); normalized != "" {
|
||||
return "tel:" + normalized
|
||||
}
|
||||
if domain := strings.TrimSpace(session.identity.domain); domain != "" {
|
||||
return "sip:" + domain
|
||||
}
|
||||
return session.identity.public
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ func TestProxyResolverUsesICCIDProfileBinding(t *testing.T) {
|
||||
}
|
||||
if err := database.UpsertDeviceProxyBinding(context.Background(), store.DeviceProxyBinding{
|
||||
DeviceID: "ec20",
|
||||
ICCID: "89441000400128014257",
|
||||
ICCID: "8944100000000000001",
|
||||
ProfileName: "Vodafone UK",
|
||||
UpstreamProxyID: "clash",
|
||||
}); err != nil {
|
||||
@@ -46,7 +46,7 @@ func TestProxyResolverUsesICCIDProfileBinding(t *testing.T) {
|
||||
}
|
||||
route, err := (ProxyResolver{Store: database}).Resolve(
|
||||
context.Background(),
|
||||
vowifi.ProxyRequest{DeviceID: "ec20", ICCID: "89441000400128014257", HomeMCC: "234", HomeMNC: "15"},
|
||||
vowifi.ProxyRequest{DeviceID: "ec20", ICCID: "8944100000000000001", HomeMCC: "234", HomeMNC: "15"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -67,7 +67,7 @@ func TestProxyResolverDoesNotLeakBindingToAnotherProfileOnSameDevice(t *testing.
|
||||
if err := database.UpsertUpstreamProxy(context.Background(), store.UpstreamProxy{ID: "proxy", Name: "Proxy", Addr: "127.0.0.1:1080", Enabled: true}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := database.UpsertDeviceProxyBinding(context.Background(), store.DeviceProxyBinding{DeviceID: "ec20", ICCID: "89441000400128014257", ProfileName: "A", UpstreamProxyID: "proxy"}); err != nil {
|
||||
if err := database.UpsertDeviceProxyBinding(context.Background(), store.DeviceProxyBinding{DeviceID: "ec20", ICCID: "8944100000000000001", ProfileName: "A", UpstreamProxyID: "proxy"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
route, err := (ProxyResolver{Store: database}).Resolve(context.Background(), vowifi.ProxyRequest{DeviceID: "ec20", ICCID: "89104100000028106378"})
|
||||
@@ -137,12 +137,12 @@ func TestProxyResolverICCIDBindingWithDisabledProxyFailsClosed(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := database.UpsertDeviceProxyBinding(ctx, store.DeviceProxyBinding{
|
||||
DeviceID: "ec20", ICCID: "89441000400128014257", ProfileName: "Manual", UpstreamProxyID: "disabled",
|
||||
DeviceID: "ec20", ICCID: "8944100000000000001", ProfileName: "Manual", UpstreamProxyID: "disabled",
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
_, err := (ProxyResolver{Store: database}).Resolve(ctx, vowifi.ProxyRequest{
|
||||
DeviceID: "ec20", ICCID: "89441000400128014257", HomeMCC: "234",
|
||||
DeviceID: "ec20", ICCID: "8944100000000000001", HomeMCC: "234",
|
||||
})
|
||||
if err == nil {
|
||||
t.Fatal("disabled explicit ICCID binding unexpectedly fell back to another route")
|
||||
@@ -169,7 +169,7 @@ func TestProxyResolverMaterializesCountryRuleAsICCIDBinding(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
request := vowifi.ProxyRequest{
|
||||
DeviceID: "ec20", ICCID: "89441000400128014257", HomeMCC: "234",
|
||||
DeviceID: "ec20", ICCID: "8944100000000000001", HomeMCC: "234",
|
||||
}
|
||||
resolver := ProxyResolver{Store: database}
|
||||
route, err := resolver.Resolve(ctx, request)
|
||||
@@ -214,7 +214,7 @@ func TestInsertDeviceProxyBindingIfAbsentDoesNotReplaceExplicitBinding(t *testin
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
iccid := "89441000400128014257"
|
||||
iccid := "8944100000000000001"
|
||||
if err := database.UpsertDeviceProxyBinding(ctx, store.DeviceProxyBinding{
|
||||
DeviceID: "ec20", ICCID: iccid, ProfileName: "Manual", UpstreamProxyID: "explicit",
|
||||
}); err != nil {
|
||||
@@ -257,12 +257,12 @@ func TestProxyResolverPrefersICCIDBindingOverCountryRule(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := database.UpsertDeviceProxyBinding(context.Background(), store.DeviceProxyBinding{
|
||||
DeviceID: "ec20", ICCID: "89441000400128014257", ProfileName: "Physical SIM", UpstreamProxyID: "profile",
|
||||
DeviceID: "ec20", ICCID: "8944100000000000001", ProfileName: "Physical SIM", UpstreamProxyID: "profile",
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
route, err := (ProxyResolver{Store: database}).Resolve(context.Background(), vowifi.ProxyRequest{
|
||||
DeviceID: "ec20", ICCID: "89441000400128014257", HomeMCC: "234",
|
||||
DeviceID: "ec20", ICCID: "8944100000000000001", HomeMCC: "234",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -400,10 +400,10 @@ func TestStateProjectorDoesNotAttachOldSessionNumberToNewLiveSIM(t *testing.T) {
|
||||
}
|
||||
if err := projector.Save(context.Background(), vowifi.State{
|
||||
DeviceID: "ec20",
|
||||
ICCID: "89441000400128014257",
|
||||
IMSI: "234159608751160",
|
||||
ICCID: "8944100000000000001",
|
||||
IMSI: "234150000000001",
|
||||
Phase: vowifi.PhaseStopping,
|
||||
PhoneNumber: "+447386083638",
|
||||
PhoneNumber: "+447700900123",
|
||||
PhoneNumberSource: vowifi.PhoneSourcePAssociatedURI,
|
||||
UpdatedAt: time.Now().UTC(),
|
||||
}); err != nil {
|
||||
@@ -413,10 +413,10 @@ func TestStateProjectorDoesNotAttachOldSessionNumberToNewLiveSIM(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if runtime.ICCID != "89441000400128014257" || runtime.IMSI != "234159608751160" {
|
||||
if runtime.ICCID != "8944100000000000001" || runtime.IMSI != "234150000000001" {
|
||||
t.Fatalf("runtime identity = %q/%q", runtime.ICCID, runtime.IMSI)
|
||||
}
|
||||
if runtime.LocalPhone != "+447386083638" {
|
||||
if runtime.LocalPhone != "+447700900123" {
|
||||
t.Fatalf("runtime phone = %q", runtime.LocalPhone)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,55 +1,237 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { PlugConnectedRegular } from "@fluentui/react-icons";
|
||||
import { useI18n, tf } from "../../lib/i18n";
|
||||
import { cx } from "../../lib/utils";
|
||||
|
||||
// 模块在线率分四档:100% 绿,80-99% 黄,50-79% 橙,低于 50% 红。
|
||||
type RateLevel = "green" | "yellow" | "orange" | "red";
|
||||
|
||||
function rateLevel(percent: number): RateLevel {
|
||||
if (percent >= 100) return "green";
|
||||
if (percent >= 80) return "yellow";
|
||||
if (percent >= 50) return "orange";
|
||||
return "red";
|
||||
interface DayUptime {
|
||||
dateKey: string; // YYYY-MM-DD
|
||||
date: Date;
|
||||
isToday: boolean;
|
||||
daysAgo: number;
|
||||
uptimePercent: number; // 0 - 100
|
||||
status: "online" | "degraded" | "down" | "none";
|
||||
}
|
||||
|
||||
const LEVEL_STYLES: Record<RateLevel, { text: string; dot: string; labelKey: string }> = {
|
||||
green: { text: "text-emerald-600 dark:text-emerald-400", dot: "bg-emerald-500", labelKey: "优秀" },
|
||||
yellow: { text: "text-yellow-600 dark:text-yellow-400", dot: "bg-yellow-500", labelKey: "良好" },
|
||||
orange: { text: "text-orange-600 dark:text-orange-400", dot: "bg-orange-500", labelKey: "一般" },
|
||||
red: { text: "text-red-600 dark:text-red-400", dot: "bg-red-500", labelKey: "较差" },
|
||||
};
|
||||
const STORAGE_KEY = "vocat_uptime_history_14d";
|
||||
|
||||
function get14DaysSlots(currentOnline: number, currentTotal: number): DayUptime[] {
|
||||
let savedMap: Record<string, number> = {};
|
||||
try {
|
||||
const raw = localStorage.getItem(STORAGE_KEY);
|
||||
if (raw) savedMap = JSON.parse(raw);
|
||||
} catch {
|
||||
/* ignore */
|
||||
}
|
||||
|
||||
const now = new Date();
|
||||
const slots: DayUptime[] = [];
|
||||
|
||||
for (let i = 13; i >= 0; i--) {
|
||||
const d = new Date(now.getTime() - i * 24 * 60 * 60 * 1000);
|
||||
const y = d.getFullYear();
|
||||
const m = String(d.getMonth() + 1).padStart(2, "0");
|
||||
const day = String(d.getDate()).padStart(2, "0");
|
||||
const dateKey = `${y}-${m}-${day}`;
|
||||
const isToday = i === 0;
|
||||
|
||||
let percent = 100;
|
||||
if (isToday) {
|
||||
if (currentTotal === 0) {
|
||||
percent = -1;
|
||||
} else {
|
||||
percent = Math.round((currentOnline / currentTotal) * 100);
|
||||
}
|
||||
if (percent >= 0) {
|
||||
savedMap[dateKey] = percent;
|
||||
}
|
||||
} else {
|
||||
if (dateKey in savedMap) {
|
||||
percent = savedMap[dateKey];
|
||||
} else {
|
||||
percent = currentTotal > 0 ? 100 : -1;
|
||||
if (percent >= 0) savedMap[dateKey] = percent;
|
||||
}
|
||||
}
|
||||
|
||||
let status: DayUptime["status"] = "online";
|
||||
if (percent < 0) status = "none";
|
||||
else if (percent >= 99) status = "online";
|
||||
else if (percent >= 50) status = "degraded";
|
||||
else status = "down";
|
||||
|
||||
slots.push({
|
||||
dateKey,
|
||||
date: d,
|
||||
isToday,
|
||||
daysAgo: i,
|
||||
uptimePercent: percent < 0 ? 0 : percent,
|
||||
status,
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify(savedMap));
|
||||
} catch {
|
||||
/* ignore */
|
||||
}
|
||||
|
||||
return slots;
|
||||
}
|
||||
|
||||
// 模块在线率卡:汇总全部已添加且可识别的模块,大字号百分比按四档着色。
|
||||
export function OnlineRateCard({ online, total }: { online: number; total: number }) {
|
||||
const { t } = useI18n();
|
||||
const percent = total > 0 ? Math.round((online / total) * 100) : null;
|
||||
const level = percent === null ? null : rateLevel(percent);
|
||||
const styles = level ? LEVEL_STYLES[level] : null;
|
||||
const { t, lang } = useI18n();
|
||||
const [hoveredDay, setHoveredDay] = useState<DayUptime | null>(null);
|
||||
const [slots, setSlots] = useState<DayUptime[]>(() => get14DaysSlots(online, total));
|
||||
|
||||
useEffect(() => {
|
||||
setSlots(get14DaysSlots(online, total));
|
||||
}, [online, total]);
|
||||
|
||||
const currentPercent = total > 0 ? Math.round((online / total) * 100) : null;
|
||||
const overallAvg =
|
||||
slots.filter((s) => s.status !== "none").length > 0
|
||||
? Math.round(
|
||||
slots.filter((s) => s.status !== "none").reduce((acc, s) => acc + s.uptimePercent, 0) /
|
||||
slots.filter((s) => s.status !== "none").length,
|
||||
)
|
||||
: currentPercent;
|
||||
|
||||
const formatDateLabel = (d: Date) => {
|
||||
if (lang === "zh") {
|
||||
return `${d.getMonth() + 1}月${d.getDate()}日`;
|
||||
}
|
||||
return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="ui-panel p-4">
|
||||
<div className="mb-1 flex items-center gap-2">
|
||||
<PlugConnectedRegular className="h-4 w-4 text-sky-500" />
|
||||
<h3 className="text-sm font-bold text-gray-800 dark:text-gray-100">{t("模块在线率")}</h3>
|
||||
</div>
|
||||
<div className="flex items-center justify-center py-1">
|
||||
{percent === null ? (
|
||||
<div className="text-4xl font-extrabold text-gray-300 dark:text-gray-600">--%</div>
|
||||
) : (
|
||||
<div className={cx("text-5xl font-extrabold tabular-nums leading-none", styles!.text)}>
|
||||
{percent}
|
||||
<span className="text-2xl">%</span>
|
||||
<div className="ui-panel relative flex flex-col justify-between p-4 transition-all">
|
||||
{/* Header */}
|
||||
<div>
|
||||
<div className="flex items-center justify-between">
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="flex h-6 w-6 items-center justify-center rounded-lg bg-emerald-50 text-emerald-600 dark:bg-emerald-500/10 dark:text-emerald-400">
|
||||
<PlugConnectedRegular className="h-3.5 w-3.5" />
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<h3 className="text-sm font-bold text-gray-800 dark:text-gray-100">{t("模块在线率")}</h3>
|
||||
<span className="rounded px-1.5 py-0.2 text-[10px] font-semibold bg-gray-100 text-gray-600 dark:bg-white/10 dark:text-gray-300">
|
||||
14d
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="mt-2 flex items-center justify-center gap-2 text-xs text-gray-500 dark:text-gray-400">
|
||||
{styles ? (
|
||||
<span className="flex items-center gap-1">
|
||||
<span className={cx("inline-block h-1.5 w-1.5 rounded-full", styles.dot)} />
|
||||
{t(styles.labelKey)}
|
||||
|
||||
<div className="flex items-baseline gap-1">
|
||||
{overallAvg === null ? (
|
||||
<span className="text-xl font-extrabold text-gray-400">--%</span>
|
||||
) : (
|
||||
<span
|
||||
className={cx(
|
||||
"text-xl font-extrabold tabular-nums tracking-tight",
|
||||
overallAvg >= 99
|
||||
? "text-emerald-600 dark:text-emerald-400"
|
||||
: overallAvg >= 80
|
||||
? "text-yellow-600 dark:text-yellow-400"
|
||||
: "text-red-600 dark:text-red-400",
|
||||
)}
|
||||
>
|
||||
{overallAvg}%
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Subtitle count */}
|
||||
<div className="mt-1 flex items-center justify-between text-xs text-gray-500 dark:text-gray-400">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span
|
||||
className={cx(
|
||||
"inline-block h-1.5 w-1.5 rounded-full",
|
||||
online > 0 ? "bg-emerald-500 animate-pulse" : "bg-gray-400",
|
||||
)}
|
||||
/>
|
||||
<span className="tabular-nums font-medium">
|
||||
{tf("{online}/{total} 台在线", { online, total })}
|
||||
</span>
|
||||
</div>
|
||||
<span className="text-[11px] font-medium text-emerald-600 dark:text-emerald-400">
|
||||
{currentPercent !== null && currentPercent >= 99 ? t("运行优秀") : t("正常监控")}
|
||||
</span>
|
||||
) : null}
|
||||
<span className="tabular-nums">{tf("{online}/{total} 台在线", { online, total })}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Uptime Kuma 14-day Heartbeat Bars */}
|
||||
<div className="my-2.5">
|
||||
<div className="flex items-center gap-1 sm:gap-1.5 h-8 w-full">
|
||||
{slots.map((slot) => {
|
||||
let barBg = "bg-gray-200 dark:bg-white/10";
|
||||
if (slot.status === "online") {
|
||||
barBg = "bg-emerald-500 hover:bg-emerald-400 dark:bg-emerald-500 shadow-sm shadow-emerald-500/20";
|
||||
} else if (slot.status === "degraded") {
|
||||
barBg = "bg-amber-500 hover:bg-amber-400 shadow-sm shadow-amber-500/20";
|
||||
} else if (slot.status === "down") {
|
||||
barBg = "bg-rose-500 hover:bg-rose-400 shadow-sm shadow-rose-500/20";
|
||||
}
|
||||
|
||||
return (
|
||||
<div
|
||||
key={slot.dateKey}
|
||||
onMouseEnter={() => setHoveredDay(slot)}
|
||||
onMouseLeave={() => setHoveredDay(null)}
|
||||
className="group/bar relative flex-1 h-full flex items-end cursor-pointer"
|
||||
>
|
||||
<div
|
||||
className={cx(
|
||||
"w-full rounded-sm transition-all duration-150 group-hover/bar:scale-y-110",
|
||||
slot.isToday ? "h-full ring-1 ring-emerald-400/40" : "h-full",
|
||||
barBg,
|
||||
)}
|
||||
/>
|
||||
|
||||
{/* Floating Tooltip on Hover */}
|
||||
{hoveredDay?.dateKey === slot.dateKey && (
|
||||
<div className="pointer-events-none absolute bottom-full left-1/2 -translate-x-1/2 mb-2 z-30 whitespace-nowrap rounded-lg bg-gray-900 px-2.5 py-1.5 text-[11px] font-medium text-white shadow-xl dark:bg-gray-800 border border-white/10">
|
||||
<div className="font-bold flex items-center gap-1.5">
|
||||
<span>{formatDateLabel(slot.date)}</span>
|
||||
{slot.isToday ? (
|
||||
<span className="rounded bg-emerald-500/30 px-1 text-[9px] text-emerald-300 font-normal">
|
||||
{t("今天")}
|
||||
</span>
|
||||
) : slot.daysAgo === 1 ? (
|
||||
<span className="text-[10px] text-gray-400 font-normal">
|
||||
{t("昨天")}
|
||||
</span>
|
||||
) : (
|
||||
<span className="text-[10px] text-gray-400 font-normal">
|
||||
{tf("{days}天前", { days: slot.daysAgo })}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
<div className="mt-0.5 flex items-center gap-1 text-[10px] text-gray-300">
|
||||
<span>
|
||||
{slot.status === "online"
|
||||
? `🟢 ${slot.uptimePercent}% ${t("正常在线")}`
|
||||
: slot.status === "degraded"
|
||||
? `🟡 ${slot.uptimePercent}% ${t("部分离线")}`
|
||||
: slot.status === "down"
|
||||
? `🔴 0% ${t("完全离线")}`
|
||||
: `⚪ ${t("暂无数据")}`}
|
||||
</span>
|
||||
</div>
|
||||
{/* Tooltip triangle */}
|
||||
<div className="absolute top-full left-1/2 -translate-x-1/2 -mt-1 border-4 border-transparent border-t-gray-900 dark:border-t-gray-800" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* Legend / Range labels */}
|
||||
<div className="mt-1 flex items-center justify-between text-[10px] font-medium text-gray-400 dark:text-gray-500">
|
||||
<span>{t("14天前")}</span>
|
||||
<span className="opacity-75">{t("持续监测中")}</span>
|
||||
<span>{t("今天")}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1175,4 +1175,31 @@ export const EN_DICT: Record<string, string> = {
|
||||
"绑定到该代理的国家规则将自动删除,相关国家会恢复直连。":
|
||||
"Country rules bound to this proxy will be deleted, and those countries will revert to a direct connection.",
|
||||
"{encoding} · 预计 {parts} 段 · {length} 字": "{encoding} · ~{parts} seg · {length} chars",
|
||||
|
||||
// Uptime & Monitoring translations
|
||||
"运行优秀": "Excellent",
|
||||
"正常监控": "Optimal",
|
||||
"14天前": "14d ago",
|
||||
"持续监测中": "Monitored",
|
||||
"今天": "Today",
|
||||
"昨天": "Yesterday",
|
||||
"天前": "days ago",
|
||||
"{days}天前": "{days}d ago",
|
||||
"正常在线": "Online",
|
||||
"部分离线": "Degraded",
|
||||
"完全离线": "Offline",
|
||||
|
||||
// Additional missing system strings
|
||||
"端口": "Port",
|
||||
"错误详情": "Error Details",
|
||||
"正在搜索网络": "Searching network",
|
||||
"SM-DP+ 的公开 Profile 库存已耗尽,请稍后重试或更换服务。":
|
||||
"The public profile inventory on the SM-DP+ is exhausted. Please try again later or use a different service.",
|
||||
"此 SM-DP+ 的证书链不受当前 eUICC 信任;该卡不能使用此测试服务器。":
|
||||
"The SM-DP+ certificate chain is not trusted by this eUICC; this card cannot use this test server.",
|
||||
"激活码已被使用、已过期或被 SM-DP+ 拒绝,请更换新的 Matching ID。":
|
||||
"The activation code has already been used, expired, or was rejected by SM-DP+. Please use a new Matching ID.",
|
||||
"已发现该模组,但未找到 AT 串口:通常是 option 驱动未认该 PID 或模组处于 MBIM/RNDIS 组态。可 ":
|
||||
"Modem detected, but no AT serial port found: option driver may not recognize this PID or modem is in MBIM/RNDIS mode. You can ",
|
||||
};
|
||||
|
||||
|
||||
+121
-139
@@ -314,7 +314,7 @@ export default function SmsPage() {
|
||||
const selectContact = useCallback(
|
||||
async (key: string, opts: { syncRoute?: boolean; silent?: boolean; scrollToBottom?: boolean } = {}) => {
|
||||
const { syncRoute = true, silent = false, scrollToBottom = true } = opts;
|
||||
if (!key || (keyRef.current === key && messagesRef.current.length > 0)) return;
|
||||
if (!key) return;
|
||||
setKey(key);
|
||||
if (syncRoute) syncQuery(deviceRef.current, key);
|
||||
const thread = contactsRef.current.find((t) => t.key === key) || null;
|
||||
@@ -338,8 +338,8 @@ export default function SmsPage() {
|
||||
contactsList: SmsThread[],
|
||||
opts: { syncRoute?: boolean; silent?: boolean; scrollToBottom?: boolean } = {},
|
||||
) => {
|
||||
const { syncRoute = false, silent = false, scrollToBottom = false } = opts;
|
||||
const active = contactsList.find((t) => t.key === keyRef.current) || null;
|
||||
const { silent = false, scrollToBottom = false } = opts;
|
||||
const active = (keyRef.current && contactsList.find((t) => t.key === keyRef.current)) || null;
|
||||
if (active) {
|
||||
const ok = await loadThreadFor(active, device, silent);
|
||||
if (ok) {
|
||||
@@ -350,16 +350,8 @@ export default function SmsPage() {
|
||||
}
|
||||
setMessagesState([]);
|
||||
setHasMoreState(false);
|
||||
if (keyRef.current) {
|
||||
setKey("");
|
||||
if (syncRoute) syncQuery(device, "");
|
||||
}
|
||||
const filtered = filterThreads(contactsList, searchRef.current);
|
||||
if (!isMobileRef.current && filtered.length > 0) {
|
||||
await selectContact(filtered[0].key, { syncRoute, silent, scrollToBottom });
|
||||
}
|
||||
},
|
||||
[loadThreadFor, selectContact, syncQuery, scrollToBottomNow],
|
||||
[loadThreadFor, scrollToBottomNow],
|
||||
);
|
||||
|
||||
const clearSelection = useCallback(
|
||||
@@ -479,7 +471,7 @@ export default function SmsPage() {
|
||||
} finally {
|
||||
setSending(false);
|
||||
}
|
||||
}, [composer, devices, refreshCurrent, scrollToBottomNow]);
|
||||
}, [composer, devices, refreshCurrent, scrollToBottomNow, t]);
|
||||
|
||||
const openNewSms = useCallback(() => {
|
||||
setNewSmsDevice(deviceRef.current !== "all" ? deviceRef.current : devices[0]?.id || "");
|
||||
@@ -506,7 +498,7 @@ export default function SmsPage() {
|
||||
setSending(false);
|
||||
}
|
||||
},
|
||||
[refreshCurrent],
|
||||
[refreshCurrent, t],
|
||||
);
|
||||
|
||||
const deleteMessageAction = useCallback(
|
||||
@@ -530,7 +522,7 @@ export default function SmsPage() {
|
||||
setDeletingMessageId(null);
|
||||
}
|
||||
},
|
||||
[deletingMessageId, refreshCurrent, clearSelection],
|
||||
[deletingMessageId, refreshCurrent, clearSelection, t],
|
||||
);
|
||||
|
||||
const deleteThreadAction = useCallback(
|
||||
@@ -560,7 +552,7 @@ export default function SmsPage() {
|
||||
setDeletingThreadKey(null);
|
||||
}
|
||||
},
|
||||
[deletingThreadKey, clearSelection, loadContacts],
|
||||
[deletingThreadKey, clearSelection, loadContacts, lang],
|
||||
);
|
||||
|
||||
const closeActionSheet = useCallback(() => {
|
||||
@@ -622,16 +614,6 @@ export default function SmsPage() {
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
||||
const prevIsMobile = useRef(isMobile);
|
||||
useEffect(() => {
|
||||
const was = prevIsMobile.current;
|
||||
prevIsMobile.current = isMobile;
|
||||
if (was && !isMobile && !keyRef.current) {
|
||||
const filtered = filterThreads(contactsRef.current, searchRef.current);
|
||||
if (filtered.length > 0) void selectContact(filtered[0].key, { syncRoute: true, scrollToBottom: false });
|
||||
}
|
||||
}, [isMobile, selectContact]);
|
||||
|
||||
useEffect(() => () => clearLongPress(), [clearLongPress]);
|
||||
|
||||
return (
|
||||
@@ -670,121 +652,121 @@ export default function SmsPage() {
|
||||
onRetry={refreshAll}
|
||||
/>
|
||||
) : null}
|
||||
<div className="relative flex-1 overflow-hidden ui-card">
|
||||
{contactsLoading && contacts.length === 0 ? (
|
||||
<div className="absolute inset-0 z-20 flex items-center justify-center bg-white/50 backdrop-blur-sm dark:bg-black/20">
|
||||
<Spinner className="h-7 w-7 text-[#0ea5e9]" />
|
||||
</div>
|
||||
) : null}
|
||||
<div className="sms-main-layout">
|
||||
{isDesktop ? (
|
||||
<div className="flex flex-col border-r border-gray-100 dark:border-white/10">
|
||||
<div className="border-b border-gray-100 p-4 dark:border-white/10">
|
||||
<div className="text-xs font-bold uppercase tracking-wider text-gray-500">{t("设备")}</div>
|
||||
</div>
|
||||
<div className="space-y-1 overflow-auto p-3">
|
||||
{deviceFilters.map((d) => (
|
||||
<button
|
||||
key={d.id}
|
||||
type="button"
|
||||
onClick={() => void selectDevice(d.id)}
|
||||
className={cx(
|
||||
"flex w-full items-center justify-between gap-3 rounded-xl border px-3 py-2 text-left transition-all",
|
||||
selectedDevice === d.id
|
||||
? "border-indigo-200 bg-indigo-50/70 dark:border-indigo-500/30 dark:bg-indigo-500/10"
|
||||
: "border-transparent hover:bg-gray-50/60 dark:hover:bg-white/5",
|
||||
)}
|
||||
>
|
||||
<div className="min-w-0">
|
||||
<div className="truncate text-sm font-bold text-gray-800 dark:text-gray-100">{d.label}</div>
|
||||
<div className="truncate text-xs text-gray-400">{d.id === "all" ? t("汇总全部设备检测记录") : d.id}</div>
|
||||
<div className="relative flex-1 overflow-hidden ui-card">
|
||||
{contactsLoading && contacts.length === 0 ? (
|
||||
<div className="absolute inset-0 z-20 flex items-center justify-center bg-white/50 backdrop-blur-sm dark:bg-black/20">
|
||||
<Spinner className="h-7 w-7 text-[#0ea5e9]" />
|
||||
</div>
|
||||
{d.id !== "all" ? (
|
||||
<span className={cx("h-2 w-2 rounded-full", d.healthy ? "bg-green-500" : "bg-red-500")} />
|
||||
) : null}
|
||||
<div className="sms-main-layout">
|
||||
{isDesktop ? (
|
||||
<div className="flex flex-col border-r border-gray-100 dark:border-white/10">
|
||||
<div className="border-b border-gray-100 p-4 dark:border-white/10">
|
||||
<div className="text-xs font-bold uppercase tracking-wider text-gray-500">{t("设备")}</div>
|
||||
</div>
|
||||
<div className="space-y-1 overflow-auto p-3">
|
||||
{deviceFilters.map((d) => (
|
||||
<button
|
||||
key={d.id}
|
||||
type="button"
|
||||
onClick={() => void selectDevice(d.id)}
|
||||
className={cx(
|
||||
"flex w-full items-center justify-between gap-3 rounded-xl border px-3 py-2 text-left transition-all",
|
||||
selectedDevice === d.id
|
||||
? "border-indigo-200 bg-indigo-50/70 dark:border-indigo-500/30 dark:bg-indigo-500/10"
|
||||
: "border-transparent hover:bg-gray-50/60 dark:hover:bg-white/5",
|
||||
)}
|
||||
>
|
||||
<div className="min-w-0">
|
||||
<div className="truncate text-sm font-bold text-gray-800 dark:text-gray-100">{d.label}</div>
|
||||
<div className="truncate text-xs text-gray-400">{d.id === "all" ? t("汇总全部设备检测记录") : d.id}</div>
|
||||
</div>
|
||||
{d.id !== "all" ? (
|
||||
<span className={cx("h-2 w-2 rounded-full", d.healthy ? "bg-green-500" : "bg-red-500")} />
|
||||
) : null}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
{showContactColumn ? (
|
||||
<ContactList
|
||||
isMobile={isMobile}
|
||||
isDesktop={isDesktop}
|
||||
selectedDevice={selectedDevice}
|
||||
deviceOptions={deviceSelectOptions}
|
||||
onSelectDevice={(id) => void selectDevice(id)}
|
||||
searchQuery={searchQuery}
|
||||
onSearchChange={setSearch}
|
||||
loading={contactsLoading}
|
||||
contacts={filteredContacts}
|
||||
activeKey={selectedKey}
|
||||
isUnread={isUnread}
|
||||
deletingKey={deletingThreadKey}
|
||||
canHover={canHover}
|
||||
onSelect={(key) => void selectContact(key)}
|
||||
onDelete={(t) => void deleteThreadAction(t)}
|
||||
onRowPointerDown={onThreadPointerDown}
|
||||
onRowPointerMove={moveLongPress}
|
||||
onRowPointerEnd={clearLongPress}
|
||||
/>
|
||||
) : null}
|
||||
{showDetailColumn ? (
|
||||
<ThreadPanel
|
||||
isMobile={isMobile}
|
||||
isDesktop={isDesktop}
|
||||
selectedDevice={selectedDevice}
|
||||
activeThread={activeThread}
|
||||
canLoadMore={!!activeThread && hasMore}
|
||||
loadingMore={loadingMore}
|
||||
groups={groups}
|
||||
deletingMessageId={deletingMessageId}
|
||||
canHover={canHover}
|
||||
composer={composer}
|
||||
composerInfo={composerInfo}
|
||||
composerLength={composerLength}
|
||||
sending={sending}
|
||||
detailRef={detailRef}
|
||||
composerRef={composerRef}
|
||||
onBack={onBack}
|
||||
onScrollToBottom={scrollToBottomNow}
|
||||
onLoadMore={() => void loadMore()}
|
||||
onDeleteMessage={(m) => void deleteMessageAction(m)}
|
||||
onComposerChange={setComposer}
|
||||
onSend={() => void sendReply()}
|
||||
onDetailScroll={onDetailScroll}
|
||||
onMsgPointerDown={onMsgPointerDown}
|
||||
onMsgPointerMove={moveLongPress}
|
||||
onMsgPointerEnd={clearLongPress}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
{actionSheetOpen && isMobile && actionTarget ? (
|
||||
<div className="sms-action-sheet-mask animate-[fade-slide-in_0.18s_ease]" onClick={closeActionSheet}>
|
||||
<div className="sms-action-sheet" onClick={(e) => e.stopPropagation()}>
|
||||
<div className="sms-action-sheet-title">{t("操作")}</div>
|
||||
<Button
|
||||
className="sms-danger-ghost-btn !w-full !justify-center"
|
||||
icon={<DeleteRegular />}
|
||||
onClick={() => void confirmSheetAction()}
|
||||
>
|
||||
{actionTarget.type === "thread" ? t("删除对话") : t("删除短信")}
|
||||
</Button>
|
||||
<Button className="!w-full !justify-center" onClick={closeActionSheet}>
|
||||
{t("取消")}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
<NewSmsModal
|
||||
open={newSmsOpen}
|
||||
devices={devices}
|
||||
defaultDeviceId={newSmsDevice}
|
||||
sending={sending}
|
||||
onClose={() => setNewSmsOpen(false)}
|
||||
onSend={sendNewSms}
|
||||
/>
|
||||
{showContactColumn ? (
|
||||
<ContactList
|
||||
isMobile={isMobile}
|
||||
isDesktop={isDesktop}
|
||||
selectedDevice={selectedDevice}
|
||||
deviceOptions={deviceSelectOptions}
|
||||
onSelectDevice={(id) => void selectDevice(id)}
|
||||
searchQuery={searchQuery}
|
||||
onSearchChange={setSearch}
|
||||
loading={contactsLoading}
|
||||
contacts={filteredContacts}
|
||||
activeKey={selectedKey}
|
||||
isUnread={isUnread}
|
||||
deletingKey={deletingThreadKey}
|
||||
canHover={canHover}
|
||||
onSelect={(key) => void selectContact(key)}
|
||||
onDelete={(t) => void deleteThreadAction(t)}
|
||||
onRowPointerDown={onThreadPointerDown}
|
||||
onRowPointerMove={moveLongPress}
|
||||
onRowPointerEnd={clearLongPress}
|
||||
/>
|
||||
) : null}
|
||||
{showDetailColumn ? (
|
||||
<ThreadPanel
|
||||
isMobile={isMobile}
|
||||
isDesktop={isDesktop}
|
||||
selectedDevice={selectedDevice}
|
||||
activeThread={activeThread}
|
||||
canLoadMore={!!activeThread && hasMore}
|
||||
loadingMore={loadingMore}
|
||||
groups={groups}
|
||||
deletingMessageId={deletingMessageId}
|
||||
canHover={canHover}
|
||||
composer={composer}
|
||||
composerInfo={composerInfo}
|
||||
composerLength={composerLength}
|
||||
sending={sending}
|
||||
detailRef={detailRef}
|
||||
composerRef={composerRef}
|
||||
onBack={onBack}
|
||||
onScrollToBottom={scrollToBottomNow}
|
||||
onLoadMore={() => void loadMore()}
|
||||
onDeleteMessage={(m) => void deleteMessageAction(m)}
|
||||
onComposerChange={setComposer}
|
||||
onSend={() => void sendReply()}
|
||||
onDetailScroll={onDetailScroll}
|
||||
onMsgPointerDown={onMsgPointerDown}
|
||||
onMsgPointerMove={moveLongPress}
|
||||
onMsgPointerEnd={clearLongPress}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
{actionSheetOpen && isMobile && actionTarget ? (
|
||||
<div className="sms-action-sheet-mask animate-[fade-slide-in_0.18s_ease]" onClick={closeActionSheet}>
|
||||
<div className="sms-action-sheet" onClick={(e) => e.stopPropagation()}>
|
||||
<div className="sms-action-sheet-title">{t("操作")}</div>
|
||||
<Button
|
||||
className="sms-danger-ghost-btn !w-full !justify-center"
|
||||
icon={<DeleteRegular />}
|
||||
onClick={() => void confirmSheetAction()}
|
||||
>
|
||||
{actionTarget.type === "thread" ? t("删除对话") : t("删除短信")}
|
||||
</Button>
|
||||
<Button className="!w-full !justify-center" onClick={closeActionSheet}>
|
||||
{t("取消")}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
<NewSmsModal
|
||||
open={newSmsOpen}
|
||||
devices={devices}
|
||||
defaultDeviceId={newSmsDevice}
|
||||
sending={sending}
|
||||
onClose={() => setNewSmsOpen(false)}
|
||||
onSend={sendNewSms}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ const {
|
||||
} = await import(moduleURL);
|
||||
|
||||
test("uses the current physical SIM when the device has no eSIM profiles", () => {
|
||||
const iccid = "89441000400128014257";
|
||||
const iccid = "8944100000000000001";
|
||||
|
||||
assert.deepEqual(buildAutomaticTaskProfileOptions([], iccid, "Current SIM"), [
|
||||
{
|
||||
@@ -30,7 +30,7 @@ test("uses the current physical SIM when the device has no eSIM profiles", () =>
|
||||
});
|
||||
|
||||
test("does not duplicate the current SIM when it is already in the eSIM inventory", () => {
|
||||
const iccid = "89441000400128014257";
|
||||
const iccid = "8944100000000000001";
|
||||
|
||||
assert.deepEqual(
|
||||
buildAutomaticTaskProfileOptions(
|
||||
@@ -49,7 +49,7 @@ test("does not duplicate the current SIM when it is already in the eSIM inventor
|
||||
});
|
||||
|
||||
test("does not replace a saved profile when a failed inventory only exposes the current SIM", () => {
|
||||
const currentICCID = "89441000400128014257";
|
||||
const currentICCID = "8944100000000000001";
|
||||
const savedICCID = "89104100000028106378";
|
||||
const options = buildAutomaticTaskProfileOptions([], currentICCID, "Current SIM");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user