diff --git a/frontend/src/stores/messageMedia.ts b/frontend/src/stores/messageMedia.ts new file mode 100644 index 0000000..3ef4661 --- /dev/null +++ b/frontend/src/stores/messageMedia.ts @@ -0,0 +1,39 @@ +import { defineStore } from 'pinia' + +import type { MediaType, PhoneMedia } from '@/types/media' + +type MessageMediaRequest = { + mediaType: MediaType + phoneNumber: string +} + +type MessageMediaResult = MessageMediaRequest & { + media: PhoneMedia +} + +export const useMessageMediaStore = defineStore('message-media', { + state: () => ({ + request: null as MessageMediaRequest | null, + result: null as MessageMediaResult | null, + }), + actions: { + begin(phoneNumber: string, mediaType: MediaType): void { + this.request = { mediaType, phoneNumber } + this.result = null + }, + cancel(): void { + this.request = null + }, + complete(media: PhoneMedia): void { + if (!this.request || this.request.mediaType !== media.mediaType) return + this.result = { ...this.request, media } + this.request = null + }, + consume(phoneNumber: string): PhoneMedia | null { + if (!this.result || this.result.phoneNumber !== phoneNumber) return null + const media = this.result.media + this.result = null + return media + }, + }, +}) diff --git a/frontend/src/views/apps/CameraApp.vue b/frontend/src/views/apps/CameraApp.vue index 7b9bdbc..a9ca7d2 100644 --- a/frontend/src/views/apps/CameraApp.vue +++ b/frontend/src/views/apps/CameraApp.vue @@ -15,8 +15,9 @@ import { ZapOff, } from 'lucide-vue-next' import { computed, onBeforeUnmount, onMounted, ref } from 'vue' -import { useRouter } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' +import { useMessageMediaStore } from '@/stores/messageMedia' import { usePhoneStore } from '@/stores/phone' import type { MediaType, PhoneMedia, UploadResult } from '@/types/media' import { createGameView, type GameView } from '@/utils/gameView' @@ -33,8 +34,14 @@ type CaptureItem = { const isDevelopment = import.meta.env.DEV const zoomLevels = [0.5, 1, 2, 3] as const const phone = usePhoneStore() +const messageMedia = useMessageMediaStore() +const route = useRoute() const router = useRouter() -const mode = ref('photo') +const requestedMessageMedia = computed(() => { + const value = route.query.messageAttachment + return value === 'photo' || value === 'video' ? value : null +}) +const mode = ref(requestedMessageMedia.value ?? 'photo') const selectedZoom = ref<(typeof zoomLevels)[number]>(1) const flashEnabled = ref(false) const frontCamera = ref(false) @@ -307,6 +314,11 @@ function onMessage(event: MessageEvent): void { if (result.success && result.media) { latestMedia.value = result.media updateCapture(result.correlationId, { status: 'success' }) + if (requestedMessageMedia.value === result.media.mediaType) { + messageMedia.complete(result.media) + void router.replace('/apps/messages') + return + } showCameraNotice(phone.t('Apps.camera.saved')) window.setTimeout(() => { captures.value = captures.value.filter( @@ -473,7 +485,14 @@ onBeforeUnmount(() => { class="camera-latest" type="button" :aria-label="phone.t('Apps.camera.openGallery')" - @click="router.push('/apps/photos')" + @click=" + router.push({ + path: '/apps/photos', + query: requestedMessageMedia + ? { messageAttachment: requestedMessageMedia } + : undefined, + }) + " > (() => { + const value = route.query.messageAttachment + return value === 'photo' || value === 'video' ? value : null +}) const media = ref([]) -const filter = ref('all') +const filter = ref(requestedMessageMedia.value ?? 'all') const loading = ref(true) const fetching = ref(false) const hasMore = ref(true) @@ -193,6 +202,11 @@ function observeMore(): void { } function openMedia(entry: PhoneMedia): void { + if (requestedMessageMedia.value) { + messageMedia.complete(entry) + void router.replace('/apps/messages') + return + } landscapeViewer.value = false phone.setCameraLandscape(false) selected.value = entry @@ -200,6 +214,11 @@ function openMedia(entry: PhoneMedia): void { imagePan.value = { x: 0, y: 0 } } +function cancelMessageSelection(): void { + messageMedia.cancel() + void router.replace('/apps/messages') +} + function closeMedia(): void { landscapeViewer.value = false phone.setCameraLandscape(false) @@ -326,7 +345,15 @@ onBeforeUnmount(() => { class="gallery-page !pt-[44px]" :aria-label="phone.t('Apps.photos.name')" > - + + +
@@ -385,6 +412,7 @@ onBeforeUnmount(() => {
{ onMounted(() => { void messages.loadConversations() void calls.loadContacts() + if (messages.activeNumber) { + const media = messageMedia.consume(messages.activeNumber) + if (media) { + void sendAttachment( + media.mediaType === 'photo' ? 'image' : 'video', + import.meta.env.DEV ? media.url : String(media.id), + ) + } + } }) onBeforeUnmount(() => { @@ -1035,11 +1058,11 @@ onBeforeUnmount(() => {
- - @@ -1051,7 +1074,7 @@ onBeforeUnmount(() => { {{ phone.t('Apps.messages.attachGif') }} - diff --git a/frontend/testserver/index.cjs b/frontend/testserver/index.cjs index 6d64a61..3255a8c 100644 --- a/frontend/testserver/index.cjs +++ b/frontend/testserver/index.cjs @@ -956,14 +956,19 @@ app.post('/api/:endpoint', (request, response) => { const phoneNumber = String(request.body.phoneNumber ?? '') const messageType = request.body.messageType ?? 'text' const isAttachment = ['image', 'gif', 'video'].includes(messageType) - const attachmentId = String(request.body.mediaAssetId ?? '') + const requestedAttachmentId = String(request.body.mediaAssetId ?? '') + const selectedMedia = /^\d+$/.test(requestedAttachmentId) + ? mockMedia.find((item) => String(item.id) === requestedAttachmentId) + : null + const attachmentId = selectedMedia?.url ?? requestedAttachmentId if ( !phoneNumber || (messageType === 'text' && !body) || (messageType === 'voice' && !request.body.mediaPayload) || (isAttachment && !attachmentAssets[messageType].has(attachmentId) && - !attachmentId.startsWith('https://')) + !attachmentId.startsWith('https://') && + !attachmentId.startsWith('data:image/')) ) { response.json({ success: false, error: 'invalid_message' }) return diff --git a/sky_phone/source/html/index.html b/sky_phone/source/html/index.html index a0ba38e..3fdda5b 100644 --- a/sky_phone/source/html/index.html +++ b/sky_phone/source/html/index.html @@ -4,7 +4,7 @@ Sky Phone - + diff --git a/sky_phone/source/server/messages.lua b/sky_phone/source/server/messages.lua index 1e0a6d5..b0835d0 100644 --- a/sky_phone/source/server/messages.lua +++ b/sky_phone/source/server/messages.lua @@ -57,6 +57,16 @@ local function valid_attachment_asset(message_type, value) or message_type == "gif" and allowed_media_url(value) end +local function valid_stored_attachment(message_type, value) + if valid_attachment_asset(message_type, value) then + return true + end + return (message_type == "image" or message_type == "video") + and type(value) == "string" + and #value <= Config.Media.UrlMaxLength + and value:match("^https://") ~= nil +end + local function uuid() local rows = Bridge.Database.Query("SELECT UUID() AS `id`", {}) if not rows[1] or type(rows[1].id) ~= "string" then @@ -98,7 +108,7 @@ local function format_message(row) row.media_waveform = waveform row.media_payload = nil elseif attachment_assets[row.message_type] then - if not valid_attachment_asset(row.message_type, row.media_payload) then + if not valid_stored_attachment(row.message_type, row.media_payload) then error(("[sky_phone] Message %s has an invalid attachment asset."):format(tostring(row.id))) end row.media_asset_id = row.media_payload @@ -116,12 +126,47 @@ local function format_message(row) return row end -local function validate_attachment(message_type, data) - if type(data.mediaAssetId) ~= "string" or not valid_attachment_asset(message_type, data.mediaAssetId) then +local function validate_attachment(source, device, message_type, data) + if type(data.mediaAssetId) ~= "string" then return nil end + local payload = data.mediaAssetId + if not valid_attachment_asset(message_type, payload) then + if message_type == "gif" then + return nil + end + local media_id = tonumber(payload) + if not media_id or media_id < 1 or media_id ~= math.floor(media_id) then + return nil + end + local condition + local params + if device.account_id then + condition = "`account_id` = ?" + params = { media_id, tonumber(device.account_id) } + else + condition = "`account_id` IS NULL AND `device_imei` = ?" + params = { media_id, device.imei } + end + local rows = Bridge.Database.Query(([[ + SELECT `url`, `media_type` FROM `sky_phone_media` + WHERE `id` = ? AND %s + LIMIT 1 + ]]):format(condition), params) + local media = rows[1] + local expected_type = message_type == "image" and "photo" or "video" + if not media or media.media_type ~= expected_type + or type(media.url) ~= "string" + or #media.url > Config.Media.UrlMaxLength + or not media.url:match("^https://") + then + Bridge.Debug("warn", ("[sky_phone] Rejected unowned SMS media from source %s."):format(tostring(source))) + return nil + end + payload = media.url + end local duration = nil - if message_type == "video" then + if message_type == "video" and data.mediaDurationMs ~= nil then duration = tonumber(data.mediaDurationMs) if not duration or duration < 1000 or duration > Config.Messages.VideoMaxDurationMs then return nil @@ -131,7 +176,7 @@ local function validate_attachment(message_type, data) return { duration = duration, mime = attachment_mimes[message_type], - payload = data.mediaAssetId, + payload = payload, } end @@ -380,7 +425,7 @@ Bridge.Callbacks.Register("sky_phone:messages:send", function(source, data) end body = "" elseif attachment_assets[message_type] then - attachment = validate_attachment(message_type, data) + attachment = validate_attachment(source, device, message_type, data) if not attachment then return { success = false, error = "invalid_attachment" } end