1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-27 14:28:53 +09:00
Commit Graph

2715 Commits

Author SHA1 Message Date
NoriDev
f8dcfc8258 Merge remote-branch 'misskey/develop' 2024-11-21 09:32:32 +09:00
rectcoordsystem
090e9392cd
Merge commit from fork
* fix(backend): check target IP before sending HTTP request

* fix(backend): allow accessing private IP when testing

* Apply suggestions from code review

Co-authored-by: anatawa12 <anatawa12@icloud.com>

* fix(backend): lint and typecheck

* fix(backend): add isLocalAddressAllowed option to getAgentByUrl and send (HttpRequestService)

* fix(backend): allow fetchSummaryFromProxy, trueMail to access local addresses

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-11-21 08:27:09 +09:00
Julia
b9cb949eb1
Merge commit from fork
* Fix poll update spoofing

* fix: Disallow negative poll counts

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-11-21 08:24:50 +09:00
Julia
5f675201f2
Merge commit from fork
* enhance: Add a few validation fixes from Sharkey

See the original MR on the GitLab instance:
https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/484

Co-Authored-By: Dakkar <dakkar@thenautilus.net>

* fix: primitive 2: acceptance of cross-origin alternate

Co-Authored-By: Laura Hausmann <laura@hausmann.dev>

* fix: primitive 3: validation of non-final url

* fix: primitive 4: missing same-origin identifier validation of collection-wrapped activities

* fix: primitives 5 & 8: reject activities with non
string identifiers

Co-Authored-By: Laura Hausmann <laura@hausmann.dev>

* fix: primitive 6: reject anonymous objects that were fetched by their id

* fix: primitives 9, 10 & 11: http signature validation
doesn't enforce required headers or specify auth header name

Co-Authored-By: Laura Hausmann <laura@hausmann.dev>

* fix: primitive 14: improper validation of outbox, followers, following & shared inbox collections

* fix: code style for primitive 14

* fix: primitive 15: improper same-origin validation for
note uri and url

Co-Authored-By: Laura Hausmann <laura@hausmann.dev>

* fix: primitive 16: improper same-origin validation for user uri and url

* fix: primitive 17: note same-origin identifier validation can be bypassed by wrapping the id in an array

* fix: code style for primitive 17

* fix: check attribution against actor in notes

While this isn't strictly required to fix the exploits at hand, this
mirrors the fix in `ApQuestionService` for GHSA-5h8r-gq97-xv69, as a
preemptive countermeasure.

* fix: primitive 18: `ap/get` bypasses access checks

One might argue that we could make this one actually preform access
checks against the returned activity object, but I feel like that's a
lot more work than just restricting it to administrators, since, to me
at least, it seems more like a debugging tool than anything else.

* fix: primitive 19 & 20: respect blocks and hide more

Ideally, the user property should also be hidden (as leaving it in leaks
information slightly), but given the schema of the note endpoint, I
don't think that would be possible without introducing some kind of
"ghost" user, who is attributed for posts by users who have you blocked.

* fix: primitives 21, 22, and 23: reuse resolver

This also increases the default `recursionLimit` for `Resolver`, as it
theoretically will go higher that it previously would and could possibly
fail on non-malicious collection activities.

* fix: primitives 25-33: proper local instance checks

* revert: fix: primitive 19 & 20

This reverts commit 465a9fe6591de90f78bd3d084e3c01e65dc3cf3c.

---------

Co-authored-by: Dakkar <dakkar@thenautilus.net>
Co-authored-by: Laura Hausmann <laura@hausmann.dev>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-11-21 08:20:09 +09:00
Sayamame-beans
aa48a0e207
Fix: リノートミュートが新規投稿通知に対して作用していなかった問題を修正 (#15006)
* fix(backend): renoteMute doesn't work for note notification

* docs(changelog): update changelog
2024-11-21 08:00:50 +09:00
syuilo
f0c3a4cc0b
perf(frontend): reduce api requests for non-logged-in enviroment (#15001)
* wip

* Update CHANGELOG.md

* wip
2024-11-21 07:58:34 +09:00
zawa-ch.
763c708253
Fix(backend): アカウント削除のモデレーションログが動作していないのを修正 (#14996) (#14997)
* アカウント削除のモデレーションログが動作していないのを修正

* update CHANGELOG
2024-11-19 21:12:40 +09:00
NoriDev
17dafbc847 Merge remote-branch 'misskey/develop' 2024-11-19 15:18:37 +09:00
おさむのひと
7b9c884a5d
refactor(backend): SystemWebhookで送信されるペイロードの型を追加 (#14980) 2024-11-19 10:41:39 +09:00
饺子w (Yumechi)
e800c0f85a
fix(backend): お知らせ作成時に画像URL入力欄を空欄に変更できないのを修正 (#14990)
* fix(backend): アナウンスメントを作成ときに画像URLを後悔できないのを修正

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

* Update CHANGELOG.md

Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>

---------

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
2024-11-19 10:29:42 +09:00
CDN
b3c2de2b26
fix(backend): fallback sharedInbox to null in ApPersonService (#14970) 2024-11-16 18:53:28 +09:00
syuilo
eef0c895bc use execa 8.0.1
#14966
2024-11-15 19:48:31 +09:00
syuilo
d9d92bcfbf Revert "use nodemon 3.0.2"
This reverts commit ce1f84e5a3.
2024-11-15 19:40:12 +09:00
syuilo
ce1f84e5a3 use nodemon 3.0.2
#14966
2024-11-15 19:33:50 +09:00
かっこかり
c0d1682604
feat: 送信したフォローリクエストを確認できるように (#14856)
* FEAT: Allow users to view pending follow requests they sent

This commit implements the `following/requests/sent` interface firstly
implemented on Firefish, and provides a UI interface to view the pending
follow requests users sent.

* ux: should not show follow requests tab when have no pending sent follow req

* fix default followreq tab

* fix default followreq tab

* restore missing hasPendingReceivedFollowRequest in navbar

* refactor

* use tabler icons

* tweak design

* Revert "ux: should not show follow requests tab when have no pending sent follow req"

This reverts commit e580b92c37f27c2849c6d27e22ca4c47086081bb.

* Update Changelog

* Update Changelog

* change tab titles

---------

Co-authored-by: Lhc_fl <lhcfl@outlook.com>
Co-authored-by: Hazelnoot <acomputerdog@gmail.com>
2024-11-15 17:30:54 +09:00
syuilo
e26e24b610
update deps (#14950)
* update deps

* wip

* Revert "wip"

This reverts commit 393de249fe248ae181221266e0b7828a3ac53152.

* wip

* wip

* wip

* wip
2024-11-15 17:22:00 +09:00
NoriDev
d23f4bfb1b fix(backend): 그룹 초대 알림을 수락하거나 거절하면 알림 목록을 볼 수 없음 2024-11-15 12:16:30 +09:00
NoriDev
537d290b16 Merge remote-branch 'misskey/develop' 2024-11-14 14:48:37 +09:00
NoriDev
1078cd098f feat: Misskey 2024.10.1에 적용된 스팸 대책의 일부 개선 안내
- 이 변경은 다양한 상황에서 관리자가 보다 유연하게 운영할 수 있도록 합니다.
  - 기존의 `7일 경과 시 초대제로 전환` 정책을 세분화 합니다.
    - 7일 경과 시 `초대제로 전환` 여부를 선택할 수 있음
    - 7일 경과 시 `공개 노트 허용` 여부를 선택할 수 있음
2024-11-12 16:10:53 +09:00
饺子w (Yumechi)
a11b77a415
fix(backend): Webhook Test一致性 (#14863)
* fix(backend): Webhook Test一致性

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

* UserWebhookPayload<'followed'> 修正

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

---------

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-12 09:51:18 +09:00
NoriDev
fc21aafc8d enhance(backend): 노트 게시를 예약할 때 노트 삭제 예약도 같이 사용할 수 있음 2024-11-10 00:11:29 +09:00
NoriDev
5cde43ddf3 feat(backend): 연합 대응 확장
- 이제 노트를 작성 또는 편집하면 다음 항목이 연합됩니다.
    - 우클릭 방지
    - 노트 삭제 예약 (날짜 확인)

enhance(backend): 노트 추출 대응 항목 확장
  - 다음 항목이 노트 추출에 대응합니다.
    - 이벤트
    - 우클릭 방지
2024-11-09 23:34:58 +09:00
かっこかり
4a62051ce7
fix(backend): ローカルユーザーへのメンションを含むノートが連合される際に正しいURLに変換されないことがある問題を修正 (#14879)
* fix: make sure mentions of local users get rendered correctly during AP delivery (resolves #645)

* Update Changelog

* indent

---------

Co-authored-by: Laura Hausmann <laura@hausmann.dev>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-11-09 10:58:09 +09:00
momoirodouhu
a4c5ce1413
enhance(backend) : リモートユーザーの照会をオリジナルにリダイレクトするように (#12892) (#14897)
* enhance(backend) : リモートユーザーの照会をオリジナルにリダイレクトするように (#12892)

* オリジンリダイレクトのテストをtodoとして追加。

e2eテストにリモートユーザー考慮のテストがなさそうなので。

次のコマンドで動くことは確認済みです。
curl "http://localhost:3000/@foo@bar" -H "accept: application/activity+json" -L

* Acctのパースを既存のパーサーでするように修正

* lint
2024-11-09 10:54:44 +09:00
かっこかり
e75b62f3f5
enhance(frontend): 個別お知らせページではmetaタグを出力するように (#14902)
* enhance(frontend): 個別お知らせページではmetaタグを出力するように

* Update Changelog
2024-11-09 10:53:09 +09:00
かっこかり
98b4717c45
fix(backend): SQLのサニタイズを強化 (#14920)
* Fix code scanning alert no. 28: Incomplete string escaping or encoding (MisskeyIO#800)

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
(cherry picked from commit 443335c662b14f609d6a81a8f3807e95709aebc1)

* ✌️

---------

Co-authored-by: あわわわとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-11-09 10:51:28 +09:00
NoriDev
d00a14acd5 feat: 투표 내용 번역
- 이제 투표 내용을 그대로 번역해서 볼 수 있으며, 번역된 투표 항목과 상호작용해 바로 투표할 수도 있습니다.

fix(frontend): 투표가 있는 노트에 답글을 작성할 때 노트 작성 영역에서 투표가 표시되지 않을 수 있음
2024-11-07 23:35:10 +09:00
NoriDev
69b94d9ded chore 2024-11-07 18:25:13 +09:00
4ster1sk
794cb9ffe2
fix(backend): followedMessageではなくdescriptionになっていたのを修正 (#14908) 2024-11-07 17:16:51 +09:00
NoriDev
09778c298a enhance(frontend/backend): 로그인 알림 개선
- 로그인 알림에서 로그인 한 장치의 `IP`를 표시하고 승인되지 않은 기기에 대한 대응 방법이 표시됩니다.
2024-11-07 16:32:51 +09:00
4ster1sk
bca690f256
fix(backend): フォロワーへのメッセージの絵文字をemojisに含めるように (#14904) 2024-11-07 15:10:10 +09:00
NoriDev
74f70ca3f8 enhance(backend): 노트 편집 강화
- 노트 편집 시 다음 항목도 편집할 수 있게 됩니다.
    - 이벤트
    - 노트 삭제 예약
    - 우클릭 방지
2024-11-07 14:44:53 +09:00
NoriDev
daae1aa042 Revert "fix(backend): 이밴트가 포함된 노트를 작성할 때 URL란에 링크를 첨부하면 리모트에서 잘못된 링크로 열릴 수 있음 - 리모트 서버에서 리모트에서 보기를 클릭하면 원본 노트의 URL이 아닌, 이벤트의 URL란에 입력한 링크로 이동될 수 있습니다."
This reverts commit 6e448bf8
2024-11-07 10:59:48 +09:00
かっこかり
b1c82213a3
fix(backend): FTT無効時にユーザーリストタイムラインが使用できない問題を修正 (#14878)
* fix: return getfromdb when FanoutTimeline is not enabled

* Update Changelog

* fix

---------

Co-authored-by: Lhc_fl <lhcfl@outlook.com>
2024-11-06 22:01:21 +09:00
NoriDev
e5fd3bb4c8 enhance(backend): 노트 편집 제한 강화
- 5분에 10번 편집할 수 있던 것을 5분에 5번 편집할 수 있도록 제한함.
2024-11-06 18:06:06 +09:00
NoriDev
6e448bf8c9 fix(backend): 이밴트가 포함된 노트를 작성할 때 URL란에 링크를 첨부하면 리모트에서 잘못된 링크로 열릴 수 있음
- 리모트 서버에서 `리모트에서 보기`를 클릭하면 원본 노트의 URL이 아닌, 이벤트의 URL란에 입력한 링크로 이동될 수 있습니다.
2024-11-05 20:40:53 +09:00
NoriDev
a19d2e0d3e Merge remote-branch 'misskey/master' 2024-11-05 20:06:30 +09:00
かっこかり
6718a54f6f
fix(backend): ノートを連合する際にリモートユーザーのacctの大小文字を区別して処理している問題を修正 (#14880)
* fix: make sure outgoing remote mentions get resolved correctly if referenced with non-canonical casing (resolves #646)

* Update Changelog

* Update Changelog

* indent

---------

Co-authored-by: Laura Hausmann <laura@hausmann.dev>
2024-11-03 08:26:51 +09:00
NoriDev
652403ca3b enhance(frontend): 상대방이 나를 차단한 경우 차단되었음을 알 수 있도록 개선함
- 차단되면 다음 기능들이 화면 상에서 사라지고 사용이 제한됩니다.
    - 팔로우 버튼
    - 사용자 페이지에서 기본 정보 외 다른 모든 정보는 열람할 수 없음
    - 사용자 페이지에서 요약 탭 외에 모든 탭이 사용할 수 없게됨
2024-10-31 18:14:32 +09:00
NoriDev
493878ebd8 enhance(backend): 이모지를 등록할 때 시스템 사용자로 다시 업로드 하도록 변경함 (yojo-art/cherrypick#510)
- 이모지를 등록한 사용자가 계정을 삭제하면 이모지도 같이 삭제되기 때문에 변경되었습니다.
2024-10-31 14:44:43 +09:00
NoriDev
e902193fcb feat: 노트 게시를 예약할 수 있음 (yojo-art/cherrypick#483, [Type4ny-Project/Type4ny@271c872c](271c872c97)) 2024-10-31 14:04:34 +09:00
NoriDev
e9d7399f12 feat: 새 노트 알림을 묶어서 표시 (yojo-art/cherrypick#328) 2024-10-29 17:14:01 +09:00
NoriDev
3599b09b27 refactor: cfm-js to mfc-js 2024-10-29 16:04:53 +09:00
caipira113
87fc9c9399 fix(backend): 로컬 전용 노트를 편집하면 편집한 노트가 연합될 수 있음 (libnare/shiftkey@654821da) 2024-10-29 10:21:26 +09:00
caipira113
ab730c4b3b chore(backend): configure separate remote object storage (libnare/shiftkey@69294dc0) 2024-10-29 10:21:25 +09:00
NoriDev
b7d0c302f5 enhance(backend): 노트 편집 제한 완화
- 1시간에 10번 편집할 수 있던 것을 5분에 10번 편집할 수 있도록 완화함.
2024-10-29 09:16:30 +09:00
かっこかり
f30d19051f
enhance(backend): check_connect.js で全RedisとDBへの接続を確認するように (#14853)
* fix race conditions in check_connect.js

(cherry picked from commit 524ddb96770690455b82522104a543c5b0b1f3b3)

* fix

* Update Changelog

---------

Co-authored-by: Hazelnoot <acomputerdog@gmail.com>
2024-10-28 21:06:54 +09:00
Tamme Schichler
8eb7749e44
fix(backend): Accept arrays in ActivityPub icon and image properties (#14825)
This is allowed according to the Activity vocabulary: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-icon
The issue is noticeable in combination with Bridgy Fed: https://github.com/snarfed/bridgy-fed/issues/1408
2024-10-28 21:06:16 +09:00
syuilo
74847bce30 enhance: アイコンデコレーション管理画面の改善 2024-10-28 20:42:14 +09:00
かっこかり
ec4358d1e8
fix(misskey-js): WebSocketの型定義をReconnectingWebsocketに依存するように (#14850)
* fix(misskey-js): WebSocketの型定義をReconnectingWebsocketに依存するように

* Update Changelog

* run api extractor

* fix

* fix
2024-10-28 11:43:05 +09:00