From 273101eb537aa390c855c200d4ad6568a5a59f8a Mon Sep 17 00:00:00 2001
From: Art051 <91856576+Art051@users.noreply.github.com>
Date: Sun, 13 Aug 2023 00:09:33 +0100
Subject: [PATCH] Amended regex pattern for permission string, taken the prefix
 options from: https://askubuntu.com/tags/files/info

---
 .../chmod-calculator/chmod-calculator.service.test.ts     | 8 ++++++++
 src/tools/chmod-calculator/chmod-calculator.service.ts    | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/tools/chmod-calculator/chmod-calculator.service.test.ts b/src/tools/chmod-calculator/chmod-calculator.service.test.ts
index 0652fcd8..4b52ee2e 100644
--- a/src/tools/chmod-calculator/chmod-calculator.service.test.ts
+++ b/src/tools/chmod-calculator/chmod-calculator.service.test.ts
@@ -279,6 +279,14 @@ describe('chmod-calculator', () => {
   describe('validateSymbolicInput', () => {
     describe('validateOrder', () => {
       it('should correctly validate the order of permissions', () => {
+        expect(checkSymbolicString('-rwxrwxrwx')).toBe('');
+        expect(checkSymbolicString('drwxrwxrwx')).toBe('');
+        expect(checkSymbolicString('lrwxrwxrwx')).toBe('');
+        expect(checkSymbolicString('brwxrwxrwx')).toBe('');
+        expect(checkSymbolicString('crwxrwxrwx')).toBe('');
+        expect(checkSymbolicString('srwxrwxrwx')).toBe('');
+        expect(checkSymbolicString('prwxrwxrwx')).toBe('');
+
         expect(checkSymbolicString('rwxrwxrwx')).toBe('');
         expect(checkSymbolicString('rw-r--r--')).toBe('');
         expect(checkSymbolicString('r-xr-xr-x')).toBe('');
diff --git a/src/tools/chmod-calculator/chmod-calculator.service.ts b/src/tools/chmod-calculator/chmod-calculator.service.ts
index 6e63538f..f30a2321 100644
--- a/src/tools/chmod-calculator/chmod-calculator.service.ts
+++ b/src/tools/chmod-calculator/chmod-calculator.service.ts
@@ -74,7 +74,7 @@ function symbolicToOctal(symbolic: string): number {
 }
 
 function checkSymbolicString(symbolicInput: string): string {
-  const generalPattern = /^([d-]|[lf-])?[rwx-]{9}$/;
+  const permissionsRegex = /^([-dlbcsp])?[rwx-]{9}$/;
 
   if (symbolicInput.length === 0) {
     return '';
@@ -82,7 +82,7 @@ function checkSymbolicString(symbolicInput: string): string {
   if (symbolicInput.length > 10) {
     return 'Invalid length.';
   }
-  if (!generalPattern.test(symbolicInput)) {
+  if (!permissionsRegex.test(symbolicInput)) {
     return 'Invalid permission pattern.';
   }