github-repos/bilibili-api
1
0
Fork 0
mirror of https://github.com/czp3009/bilibili-api.git synced 2024-12-21 20:30:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

使用 X509EncodedKeySpec 实现 RSA 加密, 兼容 Java9

Browse Source
This commit is contained in:
czp 2018-01-24 14:29:52 +08:00
parent c30685d117
commit 7b85c8a956
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -70,7 +70,6 @@ uploadArchives {
if (!hasProperty('ossPassword')) {
ext.ossPassword = ''
}
repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
authentication(userName: ossUsername, password: ossPassword)
}

31
src/main/java/com/hiczp/bilibili/api/BilibiliSecurityHelper.java
View File

@ -7,7 +7,6 @@ import com.hiczp.bilibili.api.passport.entity.LogoutResponseEntity;
import com.hiczp.bilibili.api.passport.entity.RefreshTokenResponseEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sun.security.rsa.RSAPublicKeyImpl;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
@ -16,9 +15,14 @@ import javax.crypto.NoSuchPaddingException;
import javax.security.auth.login.LoginException;
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
import java.security.interfaces.RSAPublicKey;
import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.X509EncodedKeySpec;
import java.util.Arrays;
import java.util.Base64;
import java.util.stream.Collectors;
public class BilibiliSecurityHelper {
private static final Logger LOGGER = LoggerFactory.getLogger(BilibiliSecurityHelper.class);
@ -32,26 +36,25 @@ public class BilibiliSecurityHelper {
if (keyEntity.getCode() != 0) {
throw new IOException(keyEntity.getMessage());
}
//构造无备注的 RSA 公钥字符串
String rsaPublicKeyString = Arrays.stream(keyEntity.getData().getKey().split("\n"))
.filter(string -> !string.startsWith("-"))
.collect(Collectors.joining());
//解析 RSA 公钥
RSAPublicKey rsaPublicKey;
PublicKey publicKey;
try {
rsaPublicKey = new RSAPublicKeyImpl(
Base64.getDecoder().decode(
keyEntity.getData().getKey()
.replace("-----BEGIN PUBLIC KEY-----", "")
.replace("-----END PUBLIC KEY-----", "")
.replaceAll("\n", "")
.getBytes()
)
);
} catch (InvalidKeyException e) {
X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(Base64.getDecoder().decode(rsaPublicKeyString.getBytes()));
publicKey = KeyFactory.getInstance("RSA").generatePublic(x509EncodedKeySpec);
} catch (NoSuchAlgorithmException e) {
throw new Error(e);
} catch (InvalidKeySpecException e) {
throw new IOException("get broken RSA public key");
}
//加密密码
String cipheredPassword;
try {
Cipher cipher = Cipher.getInstance("RSA");
cipher.init(Cipher.ENCRYPT_MODE, rsaPublicKey);
cipher.init(Cipher.ENCRYPT_MODE, publicKey);
cipheredPassword = new String(
Base64.getEncoder().encode(
cipher.doFinal((keyEntity.getData().getHash() + password).getBytes())

5
src/main/java/com/hiczp/bilibili/api/live/socket/LiveClient.java
View File

@ -31,17 +31,16 @@ public class LiveClient {
this.userId = userId;
}
public synchronized LiveRoomInfoEntity.LiveRoomEntity fetchRoomInfo() throws IOException {
private void fetchRoomInfo() throws IOException {
liveRoomEntity = bilibiliServiceProvider.getLiveService()
.getRoomInfo(showRoomId)
.execute()
.body()
.getData();
return liveRoomEntity;
}
public LiveClient connect() throws IOException {
LOGGER.info("Try to connect to live room {}", showRoomId);
LOGGER.info("Try to fetch info of live room {}", showRoomId);
fetchRoomInfo();
LOGGER.info("Get actual room id {}", liveRoomEntity.getRoomId());