From 8279d6a1f44c4d68b3b633a5c292991ec5a554af Mon Sep 17 00:00:00 2001 From: w30042960 Date: Tue, 24 Oct 2023 11:30:23 +0800 Subject: [PATCH] add errorcode Signed-off-by: w30042960 --- common/include/daudio_errorcode.h | 1 + .../servicesink/include/daudio_sink_stub.h | 2 +- .../servicesink/src/daudio_sink_stub.cpp | 12 +++++----- .../include/daudio_source_stub.h | 2 +- .../servicesource/src/daudio_source_stub.cpp | 22 ++++++++----------- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/common/include/daudio_errorcode.h b/common/include/daudio_errorcode.h index f0307dcc..1f8fdb59 100644 --- a/common/include/daudio_errorcode.h +++ b/common/include/daudio_errorcode.h @@ -36,6 +36,7 @@ enum DAudioErrorCode { ERR_DH_AUDIO_SA_STATUS_ERR = -40012, ERR_DH_AUDIO_NOT_FOUND_KEY = -40013, ERR_DH_AUDIO_SA_DEVID_ILLEGAL = -40014, + ERR_DH_AUDIO_SA_PERMISSION_FAIED = -40015, // trans error ERR_DH_AUDIO_TRANS_ERROR = -40015, diff --git a/services/audiomanager/servicesink/include/daudio_sink_stub.h b/services/audiomanager/servicesink/include/daudio_sink_stub.h index d16b57eb..f9000041 100644 --- a/services/audiomanager/servicesink/include/daudio_sink_stub.h +++ b/services/audiomanager/servicesink/include/daudio_sink_stub.h @@ -36,7 +36,7 @@ private: int32_t SubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); int32_t UnsubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); int32_t DAudioNotifyInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); - bool VerifyPass(); + bool VerifyPermission(); using DAudioSinkServiceFunc = int32_t (DAudioSinkStub::*)(MessageParcel &data, MessageParcel &reply, MessageOption &option); diff --git a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp index efa1645b..77d9b00f 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp @@ -68,7 +68,7 @@ int32_t DAudioSinkStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Mess return (this->*func)(data, reply, option); } -bool DAudioSinkStub::VerifyPass() +bool DAudioSinkStub::VerifyPermission() { Security::AccessToken::AccessTokenID callerToken = IPCSkeleton::GetCallingTokenID(); int result = Security::AccessToken::AccessTokenKit::VerifyAccessToken(callerToken, AUDIO_PERMISSION_NAME); @@ -80,10 +80,9 @@ bool DAudioSinkStub::VerifyPass() int32_t DAudioSinkStub::InitSinkInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (VerifyPass()) { - DHLOGI("Permission verification success."); - } else { + if (!VerifyPermission()) { DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } std::string param = data.ReadString(); int32_t ret = InitSink(param); @@ -93,10 +92,9 @@ int32_t DAudioSinkStub::InitSinkInner(MessageParcel &data, MessageParcel &reply, int32_t DAudioSinkStub::ReleaseSinkInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (VerifyPass()) { - DHLOGI("Permission verification success."); - } else { + if (!VerifyPermission()) { DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } int32_t ret = ReleaseSink(); reply.WriteInt32(ret); diff --git a/services/audiomanager/servicesource/include/daudio_source_stub.h b/services/audiomanager/servicesource/include/daudio_source_stub.h index ae887995..7cef6bb2 100644 --- a/services/audiomanager/servicesource/include/daudio_source_stub.h +++ b/services/audiomanager/servicesource/include/daudio_source_stub.h @@ -37,7 +37,7 @@ private: int32_t UnregisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); int32_t ConfigDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); int32_t DAudioNotifyInner(MessageParcel &data, MessageParcel &reply, MessageOption &option); - bool VerifyPass(); + bool VerifyPermission(); using DAudioSourceServiceFunc = int32_t (DAudioSourceStub::*)(MessageParcel &data, MessageParcel &reply, MessageOption &option); diff --git a/services/audiomanager/servicesource/src/daudio_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index 44b8bee0..2ddea3be 100644 --- a/services/audiomanager/servicesource/src/daudio_source_stub.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_stub.cpp @@ -65,7 +65,7 @@ int32_t DAudioSourceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Me return (this->*func)(data, reply, option); } -bool DAudioSourceStub::VerifyPass() +bool DAudioSourceStub::VerifyPermission() { Security::AccessToken::AccessTokenID callerToken = IPCSkeleton::GetCallingTokenID(); int result = Security::AccessToken::AccessTokenKit::VerifyAccessToken(callerToken, AUDIO_PERMISSION_NAME); @@ -77,10 +77,9 @@ bool DAudioSourceStub::VerifyPass() int32_t DAudioSourceStub::InitSourceInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (VerifyPass()) { - DHLOGI("Permission verification success."); - } else { + if (!VerifyPermission()) { DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } std::string param = data.ReadString(); sptr remoteObject = data.ReadRemoteObject(); @@ -97,10 +96,9 @@ int32_t DAudioSourceStub::InitSourceInner(MessageParcel &data, MessageParcel &re int32_t DAudioSourceStub::ReleaseSourceInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (VerifyPass()) { - DHLOGI("Permission verification success."); - } else { + if (!VerifyPermission()) { DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } int32_t ret = ReleaseSource(); reply.WriteInt32(ret); @@ -110,10 +108,9 @@ int32_t DAudioSourceStub::ReleaseSourceInner(MessageParcel &data, MessageParcel int32_t DAudioSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (VerifyPass()) { - DHLOGI("Permission verification success."); - } else { + if (!VerifyPermission()) { DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } std::string networkId = data.ReadString(); std::string dhId = data.ReadString(); @@ -132,10 +129,9 @@ int32_t DAudioSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, int32_t DAudioSourceStub::UnregisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - if (VerifyPass()) { - DHLOGI("Permission verification success."); - } else { + if (!VerifyPermission()) { DHLOGE("Permission verification fail."); + return ERR_DH_AUDIO_SA_PERMISSION_FAIED; } std::string networkId = data.ReadString(); std::string dhId = data.ReadString(); -- Gitee