Skip to content

Some fixup for external auth plugins #5306

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

Merged
merged 2 commits into from
Dec 19, 2023
Merged

Some fixup for external auth plugins #5306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec2a849
CA-386865: External auth plugin logs are not saved
liulinC Dec 19, 2023
6fa18aa
CA-386866: Invalid cross-device link during extauth configure update
liulinC Dec 19, 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
21 changes: 13 additions & 8 deletions scripts/plugins/extauth-hook-AD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import sys
import subprocess
import os
import shutil
import tempfile
import logging
import logging.handlers
Expand All @@ -37,23 +38,27 @@

def setup_logger():
"""Helper function setup logger"""
log = logging.getLogger()
addr = "/dev/log"

logging.basicConfig(
format='%(asctime)s %(levelname)s %(name)s %(funcName)s %(message)s', level=logging.DEBUG)
log = logging.getLogger()

if not os.path.exists(addr):
log.warning("{} not available, logs are not redirected".format(addr))
return

# Send to syslog local5, which will be redirected to xapi log /var/log/xensource.log
handler = logging.handlers.SysLogHandler(
facility='local5', address='/dev/log')
std_err = logging.StreamHandler(sys.stderr)
facility='local5', address=addr)
# Send to authpriv, which will be redirected to /var/log/secure
auth_log = logging.handlers.SysLogHandler(
facility="authpriv", address='/dev/log')
facility="authpriv", address=addr)
log.addHandler(handler)
log.addHandler(std_err)
log.addHandler(auth_log)


if __name__ == "__main__":
setup_logger()
setup_logger()
logger = logging.getLogger(__name__)


Expand Down Expand Up @@ -117,7 +122,7 @@ def _install(self):
with tempfile.NamedTemporaryFile(prefix="extauth-", delete=False) as file:
file.write("\n".join(self._lines).encode("utf-8"))
file.flush()
os.rename(file.name, self._file_path)
shutil.move(file.name, self._file_path)
os.chmod(self._file_path, self._file_mode)


Expand Down