Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc3e9068 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I432016e2,Id208b11b,Ia6a38729,Icdaf9e35,I842a7a64, ... 

* changes:
  logd: if eng build, be a bit more permissive about failures
  libcutils: klog inherit android_get_control_file("/dev/kmsg")
  logd: start logd service in logd uid
  logd: auditd + klogd control CAPS
  logd: drop capabilities in logd --reinit and logd.daemon
  logd: drop libminijail dependency
  logd: start logd services in logd gid
  logd: set executable's capabilities in file system
  logd: inherit android_get_control_file()
  init: service file keyword
  libcutils: add android_get_control_file()
  libcutils: add android_get_control_socket() test
parents fc08963f 107e29ac

include/cutils/files.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



#ifndef __CUTILS_FILES_H

#define __CUTILS_FILES_H



#define ANDROID_FILE_ENV_PREFIX "ANDROID_FILE_"



#ifdef __cplusplus

extern "C" {

#endif



/*

 * android_get_control_file - simple helper function to get the file

 * descriptor of our init-managed file. `path' is the filename path as

 * given in init.rc. Returns -1 on error.

 */

int android_get_control_file(const char* path);



#ifdef __cplusplus

}

#endif



#endif /* __CUTILS_FILES_H */

init/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ LOCAL_CPPFLAGS := $(init_cflags) 
LOCAL_SRC_FILES:= \

    action.cpp \

    capabilities.cpp \

    descriptors.cpp \

    import_parser.cpp \

    init_parser.cpp \

    log.cpp \
@@ -125,8 +126,10 @@ LOCAL_SRC_FILES := \ 
LOCAL_SHARED_LIBRARIES += \

    libcutils \

    libbase \

    libselinux \



LOCAL_STATIC_LIBRARIES := libinit

LOCAL_SANITIZE := integer

LOCAL_CLANG := true

LOCAL_CPPFLAGS := -Wall -Wextra -Werror

include $(BUILD_NATIVE_TEST)

init/descriptors.cpp

0 → 100644
+104 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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 "descriptors.h"



#include <ctype.h>

#include <fcntl.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <unistd.h>



#include <android-base/stringprintf.h>

#include <cutils/files.h>

#include <cutils/sockets.h>



#include "init.h"

#include "log.h"

#include "util.h"



DescriptorInfo::DescriptorInfo(const std::string& name, const std::string& type, uid_t uid,

                               gid_t gid, int perm, const std::string& context)

        : name_(name), type_(type), uid_(uid), gid_(gid), perm_(perm), context_(context) {

}



DescriptorInfo::~DescriptorInfo() {

}



std::ostream& operator<<(std::ostream& os, const DescriptorInfo& info) {

  return os << "  descriptors " << info.name_ << " " << info.type_ << " " << std::oct << info.perm_;

}



bool DescriptorInfo::operator==(const DescriptorInfo& other) const {

  return name_ == other.name_ && type_ == other.type_ && key() == other.key();

}



void DescriptorInfo::CreateAndPublish(const std::string& globalContext) const {

  // Create

  const std::string& contextStr = context_.empty() ? globalContext : context_;

  int fd = Create(contextStr);

  if (fd < 0) return;



  // Publish

  std::string publishedName = key() + name_;

  std::for_each(publishedName.begin(), publishedName.end(),

                [] (char& c) { c = isalnum(c) ? c : '_'; });



  std::string val = android::base::StringPrintf("%d", fd);

  add_environment(publishedName.c_str(), val.c_str());



  // make sure we don't close on exec

  fcntl(fd, F_SETFD, 0);

}



void DescriptorInfo::Clean() const {

}



SocketInfo::SocketInfo(const std::string& name, const std::string& type, uid_t uid,

                       gid_t gid, int perm, const std::string& context)

        : DescriptorInfo(name, type, uid, gid, perm, context) {

}



void SocketInfo::Clean() const {

  unlink(android::base::StringPrintf(ANDROID_SOCKET_DIR "/%s", name().c_str()).c_str());

}



int SocketInfo::Create(const std::string& context) const {

  int flags = ((type() == "stream" ? SOCK_STREAM :

                (type() == "dgram" ? SOCK_DGRAM :

                 SOCK_SEQPACKET)));

  return create_socket(name().c_str(), flags, perm(), uid(), gid(), context.c_str());

}



const std::string SocketInfo::key() const {

  return ANDROID_SOCKET_ENV_PREFIX;

}



FileInfo::FileInfo(const std::string& name, const std::string& type, uid_t uid,

                   gid_t gid, int perm, const std::string& context)

        : DescriptorInfo(name, type, uid, gid, perm, context) {

}



int FileInfo::Create(const std::string& context) const {

  int flags = ((type() == "r" ? O_RDONLY :

                (type() == "w" ? (O_WRONLY | O_CREAT) :

                 (O_RDWR | O_CREAT))));

  return create_file(name().c_str(), flags, perm(), uid(), gid(), context.c_str());

}



const std::string FileInfo::key() const {

  return ANDROID_FILE_ENV_PREFIX;

}

init/descriptors.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */





#ifndef _INIT_DESCRIPTORS_H

#define _INIT_DESCRIPTORS_H



#include <sys/types.h>



#include <string>



class DescriptorInfo {

 public:

  DescriptorInfo(const std::string& name, const std::string& type, uid_t uid,

                 gid_t gid, int perm, const std::string& context);

  virtual ~DescriptorInfo();



  friend std::ostream& operator<<(std::ostream& os, const class DescriptorInfo& info);

  bool operator==(const DescriptorInfo& other) const;



  void CreateAndPublish(const std::string& globalContext) const;

  virtual void Clean() const;



 protected:

  const std::string& name() const { return name_; }

  const std::string& type() const { return type_; }

  uid_t uid() const { return uid_; }

  gid_t gid() const { return gid_; }

  int perm() const { return perm_; }

  const std::string& context() const { return context_; }



 private:

  std::string name_;

  std::string type_;

  uid_t uid_;

  gid_t gid_;

  int perm_;

  std::string context_;



  virtual int Create(const std::string& globalContext) const = 0;

  virtual const std::string key() const = 0;

};



std::ostream& operator<<(std::ostream& os, const DescriptorInfo& info);



class SocketInfo : public DescriptorInfo {

 public:

  SocketInfo(const std::string& name, const std::string& type, uid_t uid,

             gid_t gid, int perm, const std::string& context);

  void Clean() const override;

 private:

  virtual int Create(const std::string& context) const override;

  virtual const std::string key() const override;

};



class FileInfo : public DescriptorInfo {

 public:

  FileInfo(const std::string& name, const std::string& type, uid_t uid,

           gid_t gid, int perm, const std::string& context);

 private:

  virtual int Create(const std::string& context) const override;

  virtual const std::string key() const override;

};



#endif

init/readme.txt

+14 −6
Original line number Diff line number Diff line
@@ -141,12 +141,20 @@ setenv <name> <value> 
  Set the environment variable <name> to <value> in the launched process.



socket <name> <type> <perm> [ <user> [ <group> [ <seclabel> ] ] ]

  Create a unix domain socket named /dev/socket/<name> and pass

  its fd to the launched process.  <type> must be "dgram", "stream" or "seqpacket".

  User and group default to 0.

  'seclabel' is the SELinux security context for the socket.

  It defaults to the service security context, as specified by seclabel or

  computed based on the service executable file security context.

  Create a unix domain socket named /dev/socket/<name> and pass its fd to the

  launched process.  <type> must be "dgram", "stream" or "seqpacket".  User and

  group default to 0.  'seclabel' is the SELinux security context for the

  socket.  It defaults to the service security context, as specified by

  seclabel or computed based on the service executable file security context.

  For native executables see libcutils android_get_control_socket().



file <path> <type> <perm> [ <user> [ <group> [ <seclabel> ] ] ]

  Open/Create a file path and pass its fd to the launched process.  <type> must

  be "r", "w" or "rw".  User and group default to 0.  'seclabel' is the SELinux

  security context for the file if it must be created.  It defaults to the

  service security context, as specified by seclabel or computed based on the

  service executable file security context.  For native executables see

  libcutils android_get_control_file().



user <username>

  Change to 'username' before exec'ing this service.