Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

fix: 修复 w_rid 计算漏洞 #301

Merged
merged 3 commits into from
May 24, 2023
Merged

fix: 修复 w_rid 计算漏洞 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78de5be
fix: 修复 w_rid 计算漏洞
Drelf2018 May 21, 2023
adfa4f0
fix: wts也要参与计算
Drelf2018 May 23, 2023
c22c6fe
fix: 修改get_user_info()参数
Drelf2018 May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion bilibili_api/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,12 @@ async def get_user_info(self) -> dict:
dict: 调用接口返回的内容。
"""
api = API["info"]["info"]
params = {"mid": self.__uid}
params = {
"mid": self.__uid,
"token": "",
"platform": "web",
"web_location": 1550101
}
return await request(
"GET", url=api["url"], params=params, credential=self.credential
)
Expand Down
15 changes: 8 additions & 7 deletions bilibili_api/utils/network_httpx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,24 @@ async def get_mixin_key() -> str:
wbi_img: Dict[str, str] = data["wbi_img"]
split = lambda key: wbi_img.get(key).split("/")[-1].split(".")[0]
ae = split("img_url") + split("sub_url")
oe = [46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49, 33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41,
13, 37, 48, 7, 16, 24, 55, 40, 61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11, 36, 20, 34, 44, 52]
le = reduce(lambda s, i: s + ae[i], oe, "")
oe = [46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49, 33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13,
37, 48, 7, 16, 24, 55, 40, 61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11, 36, 20, 34, 44, 52]
le = reduce(lambda s, i: s + (ae[i] if i < len(ae) else ""), oe, "")
return le[:32]


def encWbi(params: dict, mixin_key: str):
def enc_wbi(params: dict, mixin_key: str):
"""
更新请求参数
"""

Ae = "&".join([f"{key}={value}" for key, value in params.items()])
params["wts"] = int(time.time())
keys = sorted(filter(lambda k: k != "w_rid", params.keys()))
Ae = "&".join(f"{key}={params[key]}" for key in keys)
w_rid = hashlib.md5(
(Ae + mixin_key).encode(encoding="utf-8")
).hexdigest()
params["w_rid"] = w_rid
params["wts"] = int(time.time())


@atexit.register
Expand Down Expand Up @@ -130,7 +131,7 @@ async def request(
global wbi_mixin_key
if wbi_mixin_key == "":
wbi_mixin_key = await get_mixin_key()
encWbi(params, wbi_mixin_key)
enc_wbi(params, wbi_mixin_key)

# 自动添加 csrf
if not no_csrf and method in ["POST", "DELETE", "PATCH"]:
Expand Down