mirror of
https://github.com/Pardus-LiderAhenk/ahenk
synced 2024-11-13 01:02:16 +03:00
directory server disabled and generic
This commit is contained in:
Edip YILDIZ
parent
bd890f2ce1
commit
cd2fdc6608
5 changed files with 76 additions and 58 deletions
|
|
@ -162,7 +162,8 @@ class AhenkDaemon(BaseDaemon):
|
|||
print("Registration attemp")
|
||||
max_attempt_number -= 1
|
||||
self.logger.debug('Ahenk is not registered. Attempting for registration')
|
||||
registration.registration_request(self.register_hostname,self.register_user_name,self.register_user_password,self.register_directory_server)
|
||||
# registration.registration_request(self.register_hostname,self.register_user_name,self.register_user_password,self.register_directory_server)
|
||||
registration.registration_request(self.register_hostname,self.register_user_name,self.register_user_password)
|
||||
if max_attempt_number < 0:
|
||||
self.logger.warning('Number of Attempting for registration is over')
|
||||
Util.execute("/etc/init.d/ahenk stop")
|
||||
|
|
@ -248,7 +249,7 @@ class AhenkDaemon(BaseDaemon):
|
|||
self.register_hostname=hostName
|
||||
self.register_user_name=username
|
||||
self.register_user_password=password
|
||||
self.register_directory_server = directoryServer
|
||||
# self.register_directory_server = directoryServer
|
||||
|
||||
# if user_disabled is when ahenk service restarted TRUE disabled local users
|
||||
def disable_local_users(self):
|
||||
|
|
@ -385,8 +386,9 @@ if __name__ == '__main__':
|
|||
hostName = sys.argv[2]
|
||||
userName = sys.argv[3]
|
||||
password = sys.argv[4]
|
||||
directoryServer = sys.argv[5]
|
||||
ahenk_daemon.set_register_user(hostName,userName,password,directoryServer)
|
||||
# directoryServer = sys.argv[5]
|
||||
# ahenk_daemon.set_register_user(hostName,userName,password,directoryServer)
|
||||
ahenk_daemon.set_register_user(hostName,userName,password)
|
||||
ahenk_daemon.run()
|
||||
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -18,28 +18,30 @@ class AskRegister():
|
|||
self.title = title
|
||||
self.host = host
|
||||
self.master = tk.Tk()
|
||||
self.text= tk.StringVar()
|
||||
self.master.title(self.title)
|
||||
|
||||
if self.host != "":
|
||||
pass
|
||||
else:
|
||||
tk.Label(self.master, text="Etki Alanı Sunucusu : ").grid(row=0)
|
||||
self.e1 = tk.Entry(self.master)
|
||||
self.e1.grid(row=0, column=1)
|
||||
tk.Label(self.master, text="* Etki Alanı: ").grid(row=0)
|
||||
self.e1 = tk.Entry(self.master)
|
||||
self.e1.grid(row=0, column=1)
|
||||
|
||||
tk.Label(self.master, text="Yetkili Kullanıcı : ").grid(row=1)
|
||||
tk.Label(self.master, text="Parola : ").grid(row=2)
|
||||
# if self.host != "":
|
||||
# pass
|
||||
# else:
|
||||
|
||||
tk.Label(self.master, text="* Yetkili Kullanıcı : ").grid(row=1)
|
||||
tk.Label(self.master, text="* Parola : ").grid(row=2)
|
||||
tk.Label(self.master, textvariable= self.text, fg="red").grid(row=3,columnspan=2)
|
||||
|
||||
self.e2 = tk.Entry(self.master)
|
||||
self.e3 = tk.Entry(show="*")
|
||||
|
||||
self.var1 = IntVar()
|
||||
Checkbutton(self.master, text="Active Directory", variable=self.var1, command=self.check1).grid(row=3, column=0, stick=tk.W,
|
||||
pady=4)
|
||||
self.var2 = IntVar()
|
||||
self.var2.set(1)
|
||||
Checkbutton(self.master, text="OpenLDAP", variable=self.var2, command=self.check2).grid(row=3, column=1, stick=tk.W, pady=4)
|
||||
|
||||
# self.var1 = IntVar()
|
||||
# Checkbutton(self.master, text="Active Directory", variable=self.var1, command=self.check1).grid(row=3, column=0, stick=tk.W,
|
||||
# pady=4)
|
||||
# self.var2 = IntVar()
|
||||
# self.var2.set(1)
|
||||
# Checkbutton(self.master, text="OpenLDAP", variable=self.var2, command=self.check2).grid(row=3, column=1, stick=tk.W, pady=4)
|
||||
|
||||
self.e2.grid(row=1, column=1)
|
||||
self.e3.grid(row=2, column=1)
|
||||
|
|
@ -49,20 +51,23 @@ class AskRegister():
|
|||
tk.mainloop()
|
||||
|
||||
def show(self):
|
||||
if(self.e1.get() =='' or self.e2.get()=='' or self.e3.get()==''):
|
||||
self.text.set("Lütfen zorunlu alanları doldurunuz!")
|
||||
else:
|
||||
print(self.e1.get()+" "+self.e2.get()+" "+self.e3.get())
|
||||
self.master.quit()
|
||||
# if self.var2.get() == 1:
|
||||
# if self.host != "":
|
||||
# print(self.e2.get()+" "+self.e3.get()+" "+"LDAP")
|
||||
# else:
|
||||
# print(self.e1.get()+" "+self.e2.get()+" "+self.e3.get()+" "+"LDAP")
|
||||
#
|
||||
# if self.var1.get() == 1:
|
||||
# if self.host != "":
|
||||
# print(self.e2.get()+" "+self.e3.get()+" "+"AD")
|
||||
# else:
|
||||
# print(self.e1.get()+" "+self.e2.get()+" "+self.e3.get()+" "+"AD")
|
||||
|
||||
if self.var2.get() == 1:
|
||||
if self.host != "":
|
||||
print(self.e2.get()+" "+self.e3.get()+" "+"LDAP")
|
||||
else:
|
||||
print(self.e1.get()+" "+self.e2.get()+" "+self.e3.get()+" "+"LDAP")
|
||||
|
||||
if self.var1.get() == 1:
|
||||
if self.host != "":
|
||||
print(self.e2.get()+" "+self.e3.get()+" "+"AD")
|
||||
else:
|
||||
print(self.e1.get()+" "+self.e2.get()+" "+self.e3.get()+" "+"AD")
|
||||
|
||||
self.master.quit()
|
||||
|
||||
def check1(self):
|
||||
self.var2.set(0)
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class Commander(object):
|
|||
print('{0} logging out'.format(str(params[2])))
|
||||
data['event'] = params[1]
|
||||
data['username'] = params[2]
|
||||
|
||||
|
||||
elif len(params) == 4 and params[1] == 'logout':
|
||||
print('{0} logging out'.format(str(params[2])))
|
||||
data['event'] = params[1]
|
||||
|
|
|
|||
|
|
@ -13,6 +13,14 @@ class ExecuteSSSDAdAuthentication:
|
|||
|
||||
def authenticate(self, domain_name, host_name, ip_address, password, ad_username):
|
||||
try:
|
||||
# Installation of required packages
|
||||
(result_code, p_out, p_err) = self.util.execute(
|
||||
"sudo apt-get -y install realmd")
|
||||
if (result_code == 0):
|
||||
self.logger.info("İndirmeler Başarılı")
|
||||
else:
|
||||
self.logger.error("İndirmeler Başarısız : " + str(p_err))
|
||||
|
||||
# Execute the commands that require for leave
|
||||
(result_code, p_out, p_err) = self.util.execute("realm leave")
|
||||
if (result_code == 0):
|
||||
|
|
@ -109,7 +117,7 @@ class ExecuteSSSDAdAuthentication:
|
|||
self.logger.error("Script başarısız oldu : " + str(p_err))
|
||||
|
||||
# Installation of required packages
|
||||
(result_code, p_out, p_err) = self.util.execute("sudo apt-get -y install realmd sssd sssd-tools adcli packagekit samba-common-bin samba-libs")
|
||||
(result_code, p_out, p_err) = self.util.execute("sudo apt-get -y install sssd sssd-tools adcli packagekit samba-common-bin samba-libs")
|
||||
if (result_code == 0):
|
||||
self.logger.info("İndirmeler Başarılı")
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ class Registration:
|
|||
else:
|
||||
self.register(True)
|
||||
|
||||
def registration_request(self, hostname,username,password,directoryserver):
|
||||
def registration_request(self, hostname,username,password):
|
||||
|
||||
self.logger.debug('Requesting registration')
|
||||
# SetupTimer.start(Timer(System.Ahenk.registration_timeout(), timeout_function=self.registration_timeout,checker_func=self.is_registered, kwargs=None))
|
||||
|
|
@ -60,7 +60,7 @@ class Registration:
|
|||
self.host = hostname
|
||||
self.user_name = username
|
||||
self.user_password= password
|
||||
self.directory_server = directoryserver
|
||||
# self.directory_server = directoryserver
|
||||
self.showUserNotify = False;
|
||||
|
||||
if(username is None and password is None and self.host is None ):
|
||||
|
|
@ -79,12 +79,12 @@ class Registration:
|
|||
self.host = user_registration_info[0]
|
||||
self.user_name = user_registration_info[1]
|
||||
self.user_password = user_registration_info[2]
|
||||
self.directory_server = user_registration_info[3]
|
||||
# self.directory_server = user_registration_info[3]
|
||||
|
||||
else:
|
||||
self.user_name = user_registration_info[0]
|
||||
self.user_password = user_registration_info[1]
|
||||
self.directory_server = user_registration_info[2]
|
||||
# self.directory_server = user_registration_info[2]
|
||||
|
||||
#anon_messenger = AnonymousMessenger(self.message_manager.registration_msg(user_name,user_password), self.host,self.servicename)
|
||||
#anon_messenger.connect_to_server()
|
||||
|
|
@ -99,9 +99,10 @@ class Registration:
|
|||
self.messenger.send_Direct_message(self.message_manager.ldap_registration_msg())
|
||||
|
||||
def registration_success(self, reg_reply):
|
||||
|
||||
try:
|
||||
self.local_user_disable = reg_reply['disableLocalUser']
|
||||
self.directory_server = reg_reply['directoryServer']
|
||||
|
||||
if self.local_user_disable is True:
|
||||
self.conf_manager.set('MACHINE', 'user_disabled', 'true')
|
||||
else:
|
||||
|
|
@ -154,19 +155,15 @@ class Registration:
|
|||
new_line = stripped_line.replace("# disable-user-list=true", "disable-user-list=true")
|
||||
new_file_content += new_line + "\n"
|
||||
reading_file.close()
|
||||
|
||||
writing_file = open(pardus_gnome_path, "w")
|
||||
writing_file.write(new_file_content)
|
||||
writing_file.close()
|
||||
self.logger.info("gdm.conf has been configured.")
|
||||
|
||||
|
||||
|
||||
# LDAP registration
|
||||
if self.directory_server == "LDAP":
|
||||
self.install_and_config_ldap(reg_reply)
|
||||
# AD registration
|
||||
else:
|
||||
elif self.directory_server == "ACTIVE_DIRECTORY":
|
||||
self.install_and_config_ad(reg_reply)
|
||||
|
||||
except Exception as e:
|
||||
|
|
@ -333,24 +330,26 @@ class Registration:
|
|||
Util.show_message(os.getlogin(),':0',"Lider MYS sistemine ulaşılamadı. Lütfen sunucu adresini kontrol ediniz....","HATA")
|
||||
System.Process.kill_by_pid(int(System.Ahenk.get_pid_number()))
|
||||
|
||||
def purge_and_unregister(self):
|
||||
def purge_and_unregister(self,directory_type):
|
||||
try:
|
||||
self.logger.info('Ahenk conf cleaned')
|
||||
self.logger.info('Ahenk conf cleaning from db')
|
||||
self.unregister()
|
||||
|
||||
directory_type = "LDAP"
|
||||
if self.util.is_exist("/etc/ahenk/ad_info"):
|
||||
directory_type = "AD"
|
||||
|
||||
if directory_type == "LDAP":
|
||||
self.ldap_login_cancel.cancel()
|
||||
else:
|
||||
self.ad_login_cancel.cancel()
|
||||
|
||||
self.logger.info('Ahenk conf cleaned from db')
|
||||
#directory_type = "LDAP"
|
||||
#if self.util.is_exist("/etc/ahenk/ad_info"):
|
||||
# directory_type = "AD"
|
||||
self.logger.info('Cleaning ahenk conf..')
|
||||
self.clean()
|
||||
self.logger.info('Ahenk conf cleaned from db')
|
||||
self.logger.info('Ahenk conf cleaned')
|
||||
|
||||
if directory_type == "LDAP":
|
||||
self.logger.info('Ahenk cleaning LDAP config')
|
||||
self.ldap_login_cancel.cancel()
|
||||
self.logger.info('Ahenk cleaned LDAP config')
|
||||
elif directory_type =="ACTIVE_DIRECTORY":
|
||||
self.logger.info('Ahenk cleaning ACTIVE_DIRECTORY config')
|
||||
self.ad_login_cancel.cancel()
|
||||
self.logger.info('Ahenk cleaned ACTIVE_DIRECTORY config')
|
||||
|
||||
if self.conf_manager.has_section('MACHINE'):
|
||||
user_disabled = self.conf_manager.get("MACHINE", "user_disabled")
|
||||
|
|
@ -362,12 +361,16 @@ class Registration:
|
|||
self.logger.info('Local users already enabled')
|
||||
# İf desktop env is XFCE configured lightdm.service
|
||||
if self.util.get_desktop_env() == "xfce":
|
||||
self.logger.info('XFCE conf file deleting')
|
||||
pardus_xfce_path = "/usr/share/lightdm/lightdm.conf.d/99-pardus-xfce.conf"
|
||||
if self.util.is_exist(pardus_xfce_path):
|
||||
self.logger.info("99-pardus-xfce.conf exists. Deleting file.")
|
||||
self.util.delete_file(pardus_xfce_path)
|
||||
|
||||
self.logger.info('XFCE conf file deleted')
|
||||
|
||||
if self.util.get_desktop_env() == "gnome":
|
||||
self.logger.info('GNOME conf file deleting')
|
||||
pardus_gnome_path = "/etc/gdm3/greeter.dconf-defaults"
|
||||
if not self.util.is_exist(pardus_gnome_path):
|
||||
self.logger.info("Gnome conf doesn't exist")
|
||||
|
|
@ -386,7 +389,7 @@ class Registration:
|
|||
writing_file.write(new_file_content)
|
||||
writing_file.close()
|
||||
self.logger.info("gdm.conf has been configured.")
|
||||
|
||||
self.logger.info('GNOME conf file deleted')
|
||||
Util.shutdown()
|
||||
except Exception as e:
|
||||
self.logger.error("Error while running purge_and_unregister process.. Error Message " + str(e))
|
||||
|
|
|
|||
Loading…
Reference in a new issue