8fa8896d2e
- limit AID_SYSTEM uid or gid to read security buffer messages - adjust liblog tests to reflect the reality of this adjustment To fully test all security buffer paths and modes $ su 0,0,0 /data/nativetest/liblog-unit-tests/liblog-unit-tests --gtest_filter=liblog.__security* $ su 1000,1000,1000 /data/nativetest/liblog-unit-tests/liblog-unit-tests --gtest_filter=liblog.__security* $ su 2000,2000,2000 /data/nativetest/liblog-unit-tests/liblog-unit-tests --gtest_filter=liblog.__security* ToDo: Integrate the above individually into the gTest Q/A testing Bug: 26029733 Change-Id: Idcf5492db78fa6934ef6fb43f3ef861052675651
103 lines
3.3 KiB
C++
103 lines
3.3 KiB
C++
/*
|
|
* Copyright (C) 2012-2014 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "FlushCommand.h"
|
|
#include "LogBufferElement.h"
|
|
#include "LogCommand.h"
|
|
#include "LogReader.h"
|
|
#include "LogTimes.h"
|
|
#include "LogUtils.h"
|
|
|
|
FlushCommand::FlushCommand(LogReader &reader,
|
|
bool nonBlock,
|
|
unsigned long tail,
|
|
unsigned int logMask,
|
|
pid_t pid,
|
|
uint64_t start,
|
|
uint64_t timeout) :
|
|
mReader(reader),
|
|
mNonBlock(nonBlock),
|
|
mTail(tail),
|
|
mLogMask(logMask),
|
|
mPid(pid),
|
|
mStart(start),
|
|
mTimeout((start > 1) ? timeout : 0) {
|
|
}
|
|
|
|
// runSocketCommand is called once for every open client on the
|
|
// log reader socket. Here we manage and associated the reader
|
|
// client tracking and log region locks LastLogTimes list of
|
|
// LogTimeEntrys, and spawn a transitory per-client thread to
|
|
// work at filing data to the socket.
|
|
//
|
|
// global LogTimeEntry::lock() is used to protect access,
|
|
// reference counts are used to ensure that individual
|
|
// LogTimeEntry lifetime is managed when not protected.
|
|
void FlushCommand::runSocketCommand(SocketClient *client) {
|
|
LogTimeEntry *entry = NULL;
|
|
LastLogTimes × = mReader.logbuf().mTimes;
|
|
|
|
LogTimeEntry::lock();
|
|
LastLogTimes::iterator it = times.begin();
|
|
while(it != times.end()) {
|
|
entry = (*it);
|
|
if (entry->mClient == client) {
|
|
if (entry->mTimeout.tv_sec || entry->mTimeout.tv_nsec) {
|
|
LogTimeEntry::unlock();
|
|
return;
|
|
}
|
|
entry->triggerReader_Locked();
|
|
if (entry->runningReader_Locked()) {
|
|
LogTimeEntry::unlock();
|
|
return;
|
|
}
|
|
entry->incRef_Locked();
|
|
break;
|
|
}
|
|
it++;
|
|
}
|
|
|
|
if (it == times.end()) {
|
|
// Create LogTimeEntry in notifyNewLog() ?
|
|
if (mTail == (unsigned long) -1) {
|
|
LogTimeEntry::unlock();
|
|
return;
|
|
}
|
|
entry = new LogTimeEntry(mReader, client, mNonBlock, mTail, mLogMask,
|
|
mPid, mStart, mTimeout);
|
|
times.push_front(entry);
|
|
}
|
|
|
|
client->incRef();
|
|
|
|
// release client and entry reference counts once done
|
|
entry->startReader_Locked();
|
|
LogTimeEntry::unlock();
|
|
}
|
|
|
|
bool FlushCommand::hasReadLogs(SocketClient *client) {
|
|
return clientHasLogCredentials(client);
|
|
}
|
|
|
|
static bool clientHasSecurityCredentials(SocketClient *client) {
|
|
return (client->getUid() == AID_SYSTEM) || (client->getGid() == AID_SYSTEM);
|
|
}
|
|
|
|
bool FlushCommand::hasSecurityLogs(SocketClient *client) {
|
|
return clientHasSecurityCredentials(client);
|
|
}
|