From 1d77791ef62148345b431dc8691847004cd5ada7 Mon Sep 17 00:00:00 2001
From: "anatoly@nspcc.ru" <anatoly@nspcc.ru>
Date: Wed, 2 Dec 2020 10:51:15 +0300
Subject: [PATCH] fix public keys in eACL file to base64

---
 .../lib/eacl/eacl_encoded_allow_all_pubkey    | 14 ++--
 .../lib/eacl/eacl_encoded_deny_all_pubkey     | 68 -------------------
 .../testsuites/integration/acl_extended.robot |  5 +-
 3 files changed, 9 insertions(+), 78 deletions(-)
 delete mode 100755 robot/resources/lib/eacl/eacl_encoded_deny_all_pubkey

diff --git a/robot/resources/lib/eacl/eacl_encoded_allow_all_pubkey b/robot/resources/lib/eacl/eacl_encoded_allow_all_pubkey
index 6c853ee..7b6774e 100755
--- a/robot/resources/lib/eacl/eacl_encoded_allow_all_pubkey
+++ b/robot/resources/lib/eacl/eacl_encoded_allow_all_pubkey
@@ -5,7 +5,7 @@
       "action": "ALLOW",
       "targets": [
         {
-          "keys": [ "03db43cba61ef948a65c20b326b9409911341436478dfdd7472c9af6b10bb60000" ]
+          "keys": [ "A9tDy6Ye+UimXCCzJrlAmRE0FDZHjf3XRyya9rELtgAA" ]
         }
       ]
     },
@@ -14,7 +14,7 @@
       "action": "ALLOW",
       "targets": [
         {
-          "keys": [ "03db43cba61ef948a65c20b326b9409911341436478dfdd7472c9af6b10bb60000" ]
+          "keys": [ "A9tDy6Ye+UimXCCzJrlAmRE0FDZHjf3XRyya9rELtgAA" ]
         }
       ]
     },
@@ -23,7 +23,7 @@
       "action": "ALLOW",
       "targets": [
         {
-          "keys": [ "03db43cba61ef948a65c20b326b9409911341436478dfdd7472c9af6b10bb60000" ]
+          "keys": [ "A9tDy6Ye+UimXCCzJrlAmRE0FDZHjf3XRyya9rELtgAA" ]
         }
       ]
     },
@@ -32,7 +32,7 @@
       "action": "ALLOW",
       "targets": [
         {
-          "keys": [ "03db43cba61ef948a65c20b326b9409911341436478dfdd7472c9af6b10bb60000" ]
+          "keys": [ "A9tDy6Ye+UimXCCzJrlAmRE0FDZHjf3XRyya9rELtgAA" ]
         }
       ]
     },
@@ -41,7 +41,7 @@
       "action": "ALLOW",
       "targets": [
         {
-          "keys": [ "03db43cba61ef948a65c20b326b9409911341436478dfdd7472c9af6b10bb60000" ]
+          "keys": [ "A9tDy6Ye+UimXCCzJrlAmRE0FDZHjf3XRyya9rELtgAA" ]
         }
       ]
     },
@@ -50,7 +50,7 @@
       "action": "ALLOW",
       "targets": [
         {
-          "keys": [ "03db43cba61ef948a65c20b326b9409911341436478dfdd7472c9af6b10bb60000" ]
+          "keys": [ "A9tDy6Ye+UimXCCzJrlAmRE0FDZHjf3XRyya9rELtgAA" ]
         }
       ]
     },
@@ -59,7 +59,7 @@
       "action": "ALLOW",
       "targets": [
         {
-          "keys": [ "03db43cba61ef948a65c20b326b9409911341436478dfdd7472c9af6b10bb60000" ]
+          "keys": [ "A9tDy6Ye+UimXCCzJrlAmRE0FDZHjf3XRyya9rELtgAA" ]
         }
       ]
     },
diff --git a/robot/resources/lib/eacl/eacl_encoded_deny_all_pubkey b/robot/resources/lib/eacl/eacl_encoded_deny_all_pubkey
deleted file mode 100755
index e570cc1..0000000
--- a/robot/resources/lib/eacl/eacl_encoded_deny_all_pubkey
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "records": [
-    {
-      "operation": "GET",
-      "action": "DENY",
-      "targets": [
-        {
-          "keys": [ "NSNKmYXGM6TUH4AjAbtC2afxbJMV87XdDT" ]
-        }
-      ]
-    },
-    {
-      "operation": "HEAD",
-      "action": "DENY",
-      "targets": [
-        {
-          "keys": [ "NSNKmYXGM6TUH4AjAbtC2afxbJMV87XdDT" ]
-        }
-      ]
-    },
-    {
-      "operation": "PUT",
-      "action": "DENY",
-      "targets": [
-        {
-          "keys": [ "NSNKmYXGM6TUH4AjAbtC2afxbJMV87XdDT" ]
-        }
-      ]
-    },
-    {
-      "operation": "DELETE",
-      "action": "DENY",
-      "targets": [
-        {
-          "keys": [ "NSNKmYXGM6TUH4AjAbtC2afxbJMV87XdDT" ]
-        }
-      ]
-    },
-    {
-      "operation": "SEARCH",
-      "action": "DENY",
-      "targets": [
-        {
-          "keys": [ "NSNKmYXGM6TUH4AjAbtC2afxbJMV87XdDT" ]
-        }
-      ]
-    },
-    {
-      "operation": "GETRANGE",
-      "action": "DENY",
-      "targets": [
-        {
-          "keys": [ "NSNKmYXGM6TUH4AjAbtC2afxbJMV87XdDT" ]
-        }
-      ]
-    },
-    {
-      "operation": "GETRANGEHASH",
-      "action": "DENY",
-      "targets": [
-        {
-          "keys": [ "NSNKmYXGM6TUH4AjAbtC2afxbJMV87XdDT" ]
-        }
-      ]
-    }
-  ]
-}
-
diff --git a/robot/testsuites/integration/acl_extended.robot b/robot/testsuites/integration/acl_extended.robot
index 26ec634..ff03007 100644
--- a/robot/testsuites/integration/acl_extended.robot
+++ b/robot/testsuites/integration/acl_extended.robot
@@ -33,8 +33,7 @@ Check Actions
     Check eACL Deny and Allow All Other
     Check eACL Deny and Allow All User
     Check eACL Deny and Allow All System
-    # Issue https://github.com/nspcc-dev/neofs-node/issues/224
-    # Check eACL Deny All Other and Allow All Pubkey
+    Check eACL Deny All Other and Allow All Pubkey
 
     
 Check Filters
@@ -308,7 +307,7 @@ Check eACL Deny All Other and Allow All Pubkey
                             Search object                       ${EACL_KEY}    ${CID}        ${EMPTY}                ${EMPTY}            ${FILE_USR_HEADER}     @{S_OBJ_H}
                             Head object                         ${EACL_KEY}    ${CID}        ${S_OID_USER}           ${EMPTY}            
                             Get Range                           ${EACL_KEY}    ${CID}        ${S_OID_USER}           s_get_range         ${EMPTY}            0:256
-                            Delete object                       ${EACL_KEY}    ${CID}        ${D_OID_USER}           ${EMPTY}
+                            Delete object                       ${EACL_KEY}    ${CID}        ${S_OID_USER}           ${EMPTY}
 
 
 Check eACL Deny and Allow All