Skip to content

Commit

Permalink
NAS-129779: Expose Encryption in SMB service
Browse files Browse the repository at this point in the history
  • Loading branch information
undsoft committed Jul 1, 2024
1 parent 673340b commit 76598ed
Show file tree
Hide file tree
Showing 93 changed files with 93 additions and 94 deletions.
2 changes: 1 addition & 1 deletion src/app/enums/smb-encryption.enum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export enum SmbEncryption {
}

export const smbEncryptionLabels = new Map<SmbEncryption, string>([
[SmbEncryption.Default, T('Default – follow upstream / TruNAS default')],
[SmbEncryption.Default, T('Default – follow upstream / TrueNAS default')],
[SmbEncryption.Negotiate, T('Negotiate – only encrypt transport if explicitly requested by the SMB client')],
[SmbEncryption.Desired, T('Desired – encrypt transport if supported by client during session negotiation')],
[SmbEncryption.Required, T('Required – always encrypt transport (rejecting access if client does not support encryption – incompatible with SMB1 server enable_smb1)')],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
formControlName="encryption"
[label]="'Transport Encryption Behavior' | translate"
[options]="encryptionOptions$"
[required]="true"
></ix-select>

<ix-select
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ describe('ServiceSmbComponent', () => {
'File Mask': '0666',
'Directory Mask': '0777',
'Bind IP Addresses': ['1.1.1.1', '2.2.2.2'],
'Transport Encryption Behavior': 'Default – follow upstream / TruNAS default',
'Transport Encryption Behavior': 'Default – follow upstream / TrueNAS default',
});

const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save' }));
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/af.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/ast.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/az.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/bn.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/br.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/bs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/cy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
"Define a number of minutes for <a href=\"https://linux.die.net/man/8/smartd\" target=\"_blank\">smartd</a> to wake up and check if any tests are configured to run.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/dsb.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en-au.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en-gb.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/eo.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/es-ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@
"Debugs may contain log files with personal information such as usernames or other identifying information about your system.": "",
"Dedup": "",
"Dedup VDEVs": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a number of minutes for <a href=\"https://linux.die.net/man/8/smartd\" target=\"_blank\">smartd</a> to wake up and check if any tests are configured to run.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/es-co.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/es-mx.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/es-ni.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/es-ve.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/et.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/eu.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"Dataset Write": "",
"Dataset ZFS Encryption": "",
"Datasets": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Descriptor": "",
"Desired – encrypt transport if supported by client during session negotiation": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/fy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@
"Default Route": "",
"Default TrueNAS controller": "",
"Default is UTF-8 which supports all characters in all languages.": "",
"Default – follow upstream / TruNAS default": "",
"Default – follow upstream / TrueNAS default": "",
"Defect": "",
"Define a length of time to retain the snapshot on this system. After the time expires, the snapshot is removed. Snapshots which have been replicated to other systems are not affected.": "",
"Define a maximum size for both the dataset and any child datasets. Enter <i>0</i> to remove the quota.": "",
Expand Down
Loading

0 comments on commit 76598ed

Please sign in to comment.