Add new Samba users and update configuration settings in group_vars and smb.conf.j2

group_vars/akb.yml

@@ -420,6 +420,8 @@ nis_user:
     password: '20-wieb.ke/24_%'
 
 
+samba_homes_virusfilter: true
+
 # ==========
 # vars used by roles/common/tasks/samba-install.yml
 # ==========

group_vars/all/main.yml

@@ -1776,6 +1776,9 @@ samba_server_min_protocol: {}
 #
 samba_allow_insecure_wide_links: !!str no
 
+# include vfs object 'virusfilter' to (private) homes shares
+samba_homes_virusfilter: false
+
 samba_groups: []
 
 # samba_user:

group_vars/flr.yml

@@ -382,6 +382,7 @@ nis_user:
 
   - name: kirstin
     groups:
+      - amif
       - team
       - aktion-mensch
     is_samba_user: true
@@ -419,6 +420,12 @@ nis_user:
     is_samba_user: true
     password: '20_son+keng-25.%'
 
+  - name: victoria
+    groups:
+      - amif
+    is_samba_user: true
+    password: '20.vic-to-ria/25%'
+
   - name: vincent
     groups:
       - team
@@ -440,7 +447,7 @@ nis_user:
     is_samba_user: true
     password: '20-ver-wal-tung%23!'
 
-
+samba_homes_virusfilter: true
 
 
 # ==========

group_vars/mbr.yml

@@ -404,6 +404,18 @@ nis_user:
     is_samba_user: true
     password: '8!Varianten'
 
+  - name: hendrik.roth
+    groups:
+      - all-users
+      - buero-scan
+      - bgn-finanzen-personal
+      - mbr-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - regishut-personal-finanzen
+      - direx-personal-finanzen
+    is_samba_user: true
+    password: 'H-S.tG3/wV46'
+
   - name: janine.budich
     groups:
       - all-users
@@ -438,6 +450,18 @@ nis_user:
     is_samba_user: true
     password: 'AfZg3-9S/4IX'
 
+  - name: olga.masson
+    groups:
+      - all-users
+      - buero-scan
+      - bgn-finanzen-personal
+      - mbr-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - regishut-personal-finanzen
+      - direx-personal-finanzen
+    is_samba_user: true
+    password: '6.7.mQ-sPE.o'
+
   - name: swetlana.nikitenko
     groups:
       - all-users
@@ -669,6 +693,14 @@ nis_user:
     is_samba_user: true
     password: 't32_aHxV.'
 
+  - name: katharina.mueller
+    groups:
+      - all-users
+      - buero-scan
+      - mbr-buero
+    is_samba_user: true
+    password: '6.3b-5Vy/7-3'
+
   - name: kathrin.hain
     groups:
       - ag-antisem
@@ -730,6 +762,7 @@ nis_user:
       - all-users
       - buero-scan
       - mbr-buero
+      - technik
     is_samba_user: true
     password: 'I.E7X.cUd-cc'
 
@@ -782,6 +815,14 @@ nis_user:
     is_samba_user: true
     password: 'q9.mL5-a-aYA'
 
+  - name: tirza.seene
+    groups:
+      - all-users
+      - buero-scan
+      - mbr-buero
+    is_samba_user: true
+    password: '7a9-7Rz-Rc2p'
+
 # ---
 # RIAS Berlin und Bund
 # ---
@@ -951,6 +992,8 @@ nis_user:
     password: 'RmMq-3Z--2.2'
 
 
+samba_homes_virusfilter: true
+
 
 # ==========
 # vars used by roles/common/tasks/samba-install.yml

group_vars/sprachenatelier.yml

@@ -177,6 +177,13 @@ nis_user:
     is_samba_user: true
     password: 'spa2014'
 
+  - name: genia
+    groups:
+      - intern
+      - buero
+    is_samba_user: true
+    password: '240481'
+
   - name: isadora
     groups:
       - intern
@@ -340,100 +347,7 @@ nis_user:
     is_samba_user: true
     password: '300195'
 
-
+samba_homes_virusfilter: true
-# deleted users
-#
-#  - name: marei
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '220792'
-#
-#  - name: virginia
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '160292'
-#
-#  - name: alina
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '140686'
-#
-#  - name: hannah
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '28031973'
-#
-#  - name: kristin
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '49371'
-#
-#  - name: thea
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '060995'
-#
-#  - name: katrine
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '200290'
-#
-#  - name: daniel
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '210984'
-#
-#  - name: andrea
-#    groups:
-#      - intern
-#      - buero
-#      - lpadmin
-#    is_samba_user: true
-#    password: 'kurse2010'
-#
-#  - name: tali
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '220686'
-#
-#  - name: eva
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '250791'
-#
-#  - name: mariam
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '240991'
-#
-#  - name: simone
-#    groups:
-#      - intern
-#      - buero
-#    is_samba_user: true
-#    password: '031189'
 
 
 # ==========

roles/common/handlers/main.yml

@@ -109,3 +109,11 @@
   service:
     name: nfs-kernel-server
     state: restarted
+
+- name: Reload AppArmor profile clamd
+  command: apparmor_parser -r /etc/apparmor.d/usr.sbin.clamd
+
+- name: Restart clamav-daemon
+  service:
+    name: clamav-daemon
+    state: restarted

roles/common/tasks/samba-install.yml

@@ -1,64 +1,235 @@
 ---
-
 # ---
 # Samba Server
 # ---
 
 - name: (samba-install.yml) Ensure samba packages server (buster) are installed.
   package:
-    pkg: '{{ apt_install_server_samba }}'
+    pkg: "{{ apt_install_server_samba }}"
     state: present
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
   tags:
     - samba-server
 
-
-# ---
-# Virusfilter (ClamAV) — only when at least one share has vfs_object_virusfilter: true
-# ---
-
-- name: (samba-install.yml) Ensure virusfilter (ClamAV) packages are installed
-  package:
-    pkg: '{{ apt_install_server_samba_virusfilter }}'
-    state: present
-  when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
-    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
-  tags:
-    - samba-server
-    - samba-virusfilter
-
 - name: (samba-install.yml) Ensure quarantine directory exists
   file:
     path: /data/samba/QUARANTINE
     owner: root
     group: root
-    mode: '0750'
+    mode: "0750"
     state: directory
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
-    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') |
+      selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
   tags:
     - samba-server
     - samba-virusfilter
 
-
 - name: (samba-install.yml) Ensure samba share directories exists
   file:
     path: "{{ item.path }}"
     owner: "root"
     group: "{{ item.group_write_list }}"
-    mode: '2770'
+    mode: "{{ item.dir_create_mask | default('2770', true) }}"
     state: directory
+    recurse: no
   with_items: "{{ samba_shares }}"
   loop_control:
-    label: '{{ item.name }}'
+    label: "{{ item.name }}"
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
   tags:
     - samba-shares
 
+# ---
+# Virusfilter (ClamAV) - only when at least one share has vfs_object_virusfilter: true
+# ---
+
+- name: (samba-install.yml) Ensure virusfilter (ClamAV) packages are installed
+  package:
+    pkg: "{{ apt_install_server_samba_virusfilter }}"
+    state: present
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') |
+      selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Check if ClamAV virus databases are present
+  find:
+    paths: /var/lib/clamav
+    patterns:
+      - "*.cvd"
+      - "*.cld"
+  register: clamav_db_files
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Stop clamav-freshclam service before initial database download
+  service:
+    name: clamav-freshclam
+    state: stopped
+  failed_when: false
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+    - clamav_db_files.files | length == 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Ensure clamav-daemon service is started before database update
+  service:
+    name: clamav-daemon
+    state: started
+    enabled: yes
+  failed_when: false
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Download initial ClamAV virus databases via freshclam
+  command: freshclam
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+    - clamav_db_files.files | length == 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Ensure clamav-daemon service is enabled and started
+  service:
+    name: clamav-daemon
+    state: started
+    enabled: yes
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Ensure clamav-freshclam service is enabled and started
+  service:
+    name: clamav-freshclam
+    state: started
+    enabled: yes
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') | selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-install.yml) Ensure clamav user is member of all NIS groups
+  user:
+    name: clamav
+    groups: "{{ item.name }}"
+    append: yes
+  loop: "{{ nis_groups }}"
+  loop_control:
+    label: "{{ item.name }}"
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') |
+      selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+    - nis_groups | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Ensure clamav user is member of all NIS user groups (homes virusfilter)
+  user:
+    name: clamav
+    groups: "{{ item.name }}"
+    append: yes
+  loop: "{{ nis_user }}"
+  loop_control:
+    label: "{{ item.name }}"
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_homes_virusfilter | default(false) | bool
+    - nis_user | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Get home directories of samba users (NIS users) via getent (homes virusfilter)
+  ansible.builtin.getent:
+    database: passwd
+    key: "{{ item.name }}"
+  loop: "{{ nis_user }}"
+  loop_control:
+    label: "{{ item.name }}"
+  register: samba_user_getent
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_homes_virusfilter | default(false) | bool
+    - nis_user | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Ensure home directories are group-traversable for clamd (homes virusfilter)
+  file:
+    path: "{{ item.ansible_facts.getent_passwd[item.item.name][4] }}"
+    mode: "0750"
+    state: directory
+  loop: "{{ samba_user_getent.results | default([]) }}"
+  loop_control:
+    label: "{{ item.item.name }}"
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_homes_virusfilter | default(false) | bool
+    - item.ansible_facts is defined
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Configure AppArmor local profile for clamd (data paths)
+  template:
+    src: etc/apparmor.d/local/usr.sbin.clamd.j2
+    dest: /etc/apparmor.d/local/usr.sbin.clamd
+    owner: root
+    group: root
+    mode: "0644"
+  notify:
+    - Reload AppArmor profile clamd
+    - Restart clamav-daemon
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') |
+      selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
+
+- name: (samba-config-server.yml) Ensure AllowAllMatchScan is enabled in clamd.conf
+  lineinfile:
+    path: /etc/clamav/clamd.conf
+    regexp: "^#?\\s*AllowAllMatchScan\\s"
+    line: "AllowAllMatchScan true"
+    state: present
+  notify: Restart clamav-daemon
+  when:
+    - inventory_hostname in groups['samba_server']
+    - samba_shares | selectattr('vfs_object_virusfilter', 'defined') |
+      selectattr('vfs_object_virusfilter', 'equalto', true) | list | length > 0
+  tags:
+    - samba-server
+    - samba-virusfilter
 
 # ---
 # /etc/samba/smb.conf
@@ -69,51 +240,48 @@
     path: /etc/samba/smb.conf.ORIG
   register: smb_conf_exists
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
   tags:
     - samba-server
 
 - name: (samba-install.yml) Backup existing file /etc/samba/smb.conf
   command: cp -a /etc/samba/smb.conf /etc/samba/smb.conf.ORIG
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
     - smb_conf_exists.stat.exists == False
   tags:
     - samba-server
 
-
 - name: (samba-install.yml) /etc/samba/smb.conf
   template:
     dest: /etc/samba/smb.conf
     src: etc/samba/smb.conf.j2
     owner: root
     group: root
-    mode: 0644
+    mode: 644
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
   notify:
     - Restart smbd
     - Restart nmbd
   tags:
     - samba-server
 
-
 - name: (samba-install.yml) Ensure file /etc/samba/users.map exists
   copy:
     src: "{{ role_path + '/files/etc/samba/users.map' }}"
     dest: /etc/samba/users.map
     owner: root
     group: root
-    mode: 0644
+    mode: 644
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
   notify:
     - Restart smbd
     - Restart nmbd
   tags:
     - samba-server
 
-
 # ---
 # Cronjob for cleaning up samba trash dirs
 # ---
@@ -123,25 +291,26 @@
     path: /root/bin/samba/clean_samba_trash.sh
   register: clean_samba_trash_exists
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
   tags:
     - samba-server
+    - samba-cron
 
 - name: (samba-install.yml) Adjust configuration for script 'clean_samba_trash.sh'
   template:
     dest: /root/bin/samba/conf/clean_samba_trash.conf
     src: root/bin/samba/conf/clean_samba_trash.conf.j2
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['samba_server']
     - clean_samba_trash_exists.stat.exists|bool
   tags:
     - samba-server
-
+    - samba-cron
 
 - name: (samba-config-server.yml) Check if cleaning up trash dirs is configured
   ansible.builtin.lineinfile:
     path: /root/bin/samba/conf/clean_samba_trash.conf
-    regexp: '^trash_dirs=*'
+    regexp: "^trash_dirs=*"
     state: absent
   check_mode: true
   changed_when: false
@@ -150,7 +319,6 @@
     - inventory_hostname in groups['samba_server']
   tags: [samba-server, samba-cron]
 
-  
 - name: (samba-config-server.yml) Creates a cron job for cleaning up samba trash dirs
   ansible.builtin.cron:
     name: "{{ samba_cronjob_trash_dirs.name }}"
@@ -167,7 +335,6 @@
     - (clean_samba_trash_dirs.found | int) > 0
   tags: [samba-server, samba-cron]
 
-
 # ---
 # Cronjob for setting permissions on samba shares
 # ---
@@ -180,7 +347,6 @@
     - inventory_hostname in groups['samba_server']
   tags: [samba-server, samba-cron]
 
-
 - name: (samba-config-server.yml) Adjust configuration for script 'set_permissions_samba_shares.sh'
   ansible.builtin.template:
     dest: /root/bin/samba/conf/set_permissions_samba_shares.conf
@@ -190,7 +356,6 @@
     - set_permissions_on_samba_shares_exists.stat.exists | bool
   tags: [samba-server, samba-cron]
 
-    
 - name: (samba-config-server.yml) Creates a cron job for setting permissions to samba dirs
   ansible.builtin.cron:
     name: "{{ samba_cronjob_permissions.name }}"
@@ -206,7 +371,6 @@
     - (clean_samba_trash_dirs.found | int) > 0 # << int -> bool
   tags: [samba-server, samba-cron]
 
-
 # ---
 # Samba clients
 # ---
@@ -216,8 +380,7 @@
     pkg: "{{ apt_install_client_samba }}"
     state: present
   when:
-    - "groups['nis_client']|string is search(inventory_hostname)"
+    - inventory_hostname in groups['nis_client']
     - ansible_distribution == "Ubuntu"
   tags:
     - samba-client
-

roles/common/templates/etc/apparmor.d/local/usr.sbin.clamd.j2

@@ -0,0 +1,11 @@
+# {{ ansible_managed }}
+# see: roles/common/tasks/samba-config-server.yml
+
+/data/** r,
+/data/samba/QUARANTINE/** rw,
+{% if samba_homes_virusfilter | default(false) | bool %}
+{{ nis_base_home }}/** r,
+{% if nis_base_home != '/home' %}
+/home/** r,
+{% endif %}
+{% endif %}

roles/common/templates/etc/samba/smb.conf.j2

@@ -92,7 +92,7 @@
 
 # This tells Samba to use a separate log file for each machine
 # that connects
-;   log file = /var/log/samba/log.%m
+   log file = /var/log/samba/log.%m
    log file = /var/log/samba/%I.log
 
 # Cap the size of the individual log files (in KiB).
@@ -305,6 +305,14 @@
 # next parameter to 'no' if you want to be able to write to them.
    read only = no
 
+{% if samba_homes_virusfilter | default(false) | bool %}
+# Virusfilter aktiv: Gruppe benötigt Leserecht, damit clamd (als Gruppenmitglied)
+# Dateien und Verzeichnisse direkt öffnen kann (SCAN-Kommando an clamd).
+   create mask = 0640
+   force create mode = 0040
+   directory mask = 0750
+   force directory mode = 0050
+{% else %}
 # File creation mask is set to 0700 for security reasons. If you want to
 # create files with group=rw permissions, set next parameter to 0775.
    create mask = 0700
@@ -312,6 +320,7 @@
 # Directory creation mask is set to 0700 for security reasons. If you want to
 # create dirs. with group=rw permissions, set next parameter to 0775.
    directory mask = 0700
+{% endif %}
 
 # By default, \\server\username shares can be connected to by anyone
 # with access to the samba server.
@@ -319,6 +328,38 @@
 # to \\server\username
 # This might need tweaking when using external authentication schemes
    valid users = %S
+{% if samba_homes_virusfilter | default(false) | bool %}
+
+   # --- Virusfilter-Einstellungen [homes] ---
+
+   vfs objects = virusfilter
+
+   virusfilter:scanner = clamav
+   virusfilter:socket path = /var/run/clamav/clamd.ctl
+
+   virusfilter:infected file action = delete
+
+   virusfilter:cache entry limit = 1000
+   virusfilter:cache time limit = 60
+
+   # Dateigröße: Was wird gescannt?
+   #virusfilter:max file size = 52428800   # 50 MB max
+   #virusfilter:max file size = 26214400   # 25 MB max
+   virusfilter:max file size = 15728640   # 15 MB max
+   virusfilter:min file size = 10
+
+   virusfilter:scan on open = yes
+   virusfilter:scan on close = yes
+
+   # Fehlercode bei infizierter Datei (beim Öffnen)
+   virusfilter:infected file errno on open = EACCES
+
+   # Fehlercode beim Schließen
+   virusfilter:infected file errno on close = EACCES
+
+   virusfilter:connect timeout = 30000
+   virusfilter:io timeout = 60000
+{% endif %}
 
 # Un-comment the following and create the netlogon directory for Domain Logons
 # (you need to configure Samba to act as a domain controller too.)
@@ -484,12 +525,19 @@
 
    # Dateigröße: Was wird gescannt?
    #virusfilter:max file size = 52428800   # 50 MB max
-   virusfilter:max file size = 26214400   # 25 MB max
+   #virusfilter:max file size = 26214400   # 25 MB max
+   virusfilter:max file size = 15728640   # 15 MB max
    virusfilter:min file size = 10         # unter 10 Byte ignorieren
 
    # Scan-Zeitpunkt: nur beim Öffnen, nicht beim Schließen
    virusfilter:scan on open = yes
-   virusfilter:scan on close = no
+   virusfilter:scan on close = yes
+
+   # Fehlercode bei infizierter Datei (beim Öffnen)
+   virusfilter:infected file errno on open = EACCES
+
+   # Fehlercode beim Schließen
+   virusfilter:infected file errno on close = EACCES
 
    # Timeouts (Millisekunden)
    virusfilter:connect timeout = 30000