| @@ -5,8 +5,9 @@ | ||
| 5 | 5 | |
| 6 | 6 | // Libraries |
| 7 | 7 | use Dudlewebs\WPMCS\GCP\Google\Cloud\Storage\StorageClient; |
| 8 | 8 | use Dudlewebs\WPMCS\GCP\Google\Cloud\Core\Exception\ServiceException; |
| 9 | +use Dudlewebs\WPMCS\GCP\Google\Auth\CredentialsLoader; | |
| 9 | 10 | |
| 10 | 11 | use Exception; |
| 11 | 12 | |
| 12 | 13 | class GCloud { |
| @@ -630,9 +631,9 @@ | ||
| 630 | 631 | |
| 631 | 632 | /** |
| 632 | 633 | * Make Object Public |
| 633 | 634 | * @since 1.0.0 |
| 634 | - * | |
| 635 | + * | |
| 635 | 636 | */ |
| 636 | 637 | public function toPublic($key) { |
| 637 | 638 | if(!$key) return false; |
| 638 | 639 | if(!$this->bucket) return false; |
| @@ -652,11 +653,301 @@ | ||
| 652 | 653 | return false; |
| 653 | 654 | } |
| 654 | 655 | } |
| 655 | 656 | |
| 657 | + /** | |
| 658 | + * Fetch the bucket's IAM policy with the plugin's own | |
| 659 | + * allUsers:roles/storage.objectViewer binding(s) dropped — shared by | |
| 660 | + * both drop_bucket_level_grant() and restore_bucket_level_grant() so | |
| 661 | + * the find-and-drop logic isn't written twice. Every other binding | |
| 662 | + * (project owners/editors, other service accounts, etc.) is left | |
| 663 | + * exactly as found, unlike S3 where the whole policy is safely one | |
| 664 | + * plugin-owned statement. | |
| 665 | + * @since 1.4.1 | |
| 666 | + */ | |
| 667 | + private function bucket_policy_without_own_binding() { | |
| 668 | + $iam = $this->bucket->iam(); | |
| 669 | + $policy = $iam->policy(['requestedPolicyVersion' => 3]); | |
| 656 | 670 | |
| 671 | + $bindings = []; | |
| 672 | + foreach (($policy['bindings'] ?? []) as $binding) { | |
| 673 | + if ( | |
| 674 | + isset($binding['role'], $binding['members']) && | |
| 675 | + $binding['role'] === 'roles/storage.objectViewer' && | |
| 676 | + in_array('allUsers', (array) $binding['members'], true) | |
| 677 | + ) { | |
| 678 | + continue; | |
| 679 | + } | |
| 680 | + $bindings[] = $binding; | |
| 681 | + } | |
| 682 | + | |
| 683 | + return ['iam' => $iam, 'policy' => $policy, 'bindings' => $bindings]; | |
| 684 | + } | |
| 685 | + | |
| 657 | 686 | /** |
| 658 | - * Check the object exist | |
| 687 | + * Drop the plugin's bucket-wide allUsers:objectViewer binding, if any, | |
| 688 | + * and do not re-add it — used by the enable path, once the | |
| 689 | + * Managed-Folder-scoped grant is already confirmed in effect. | |
| 690 | + * @since 1.4.1 | |
| 691 | + */ | |
| 692 | + private function drop_bucket_level_grant() { | |
| 693 | + $state = $this->bucket_policy_without_own_binding(); | |
| 694 | + $state['policy']['bindings'] = $state['bindings']; | |
| 695 | + $state['policy']['version'] = 3; | |
| 696 | + $state['iam']->setPolicy($state['policy'], ['requestedPolicyVersion' => 3]); | |
| 697 | + } | |
| 698 | + | |
| 699 | + /** | |
| 700 | + * Find-and-drop then re-add exactly one bucket-wide | |
| 701 | + * allUsers:objectViewer binding — mirrors createBucket()'s original | |
| 702 | + * grant. Used by the disable path to restore the plugin's original, | |
| 703 | + * pre-private-media public-access mechanism; find-and-drop-first | |
| 704 | + * guarantees a repeated apply/remove cycle never accumulates | |
| 705 | + * duplicate bindings. | |
| 706 | + * @since 1.4.1 | |
| 707 | + */ | |
| 708 | + private function restore_bucket_level_grant() { | |
| 709 | + $state = $this->bucket_policy_without_own_binding(); | |
| 710 | + $state['bindings'][] = [ | |
| 711 | + 'role' => 'roles/storage.objectViewer', | |
| 712 | + 'members' => ['allUsers'], | |
| 713 | + ]; | |
| 714 | + $state['policy']['bindings'] = $state['bindings']; | |
| 715 | + $state['policy']['version'] = 3; | |
| 716 | + $state['iam']->setPolicy($state['policy'], ['requestedPolicyVersion' => 3]); | |
| 717 | + } | |
| 718 | + | |
| 719 | + /** | |
| 720 | + * Hand-written, authenticated REST call against GCS's Managed Folders | |
| 721 | + * API (storage/v1/b/{bucket}/managedFolders/...) — the vendored SDK has | |
| 722 | + * no native class for this resource. Mints a fresh Guzzle client from | |
| 723 | + * the same service-account JSON already trusted for the ordinary | |
| 724 | + * StorageClient, since Bucket::$connection/StorageClient::$connection | |
| 725 | + * have no public accessor into their internal auth machinery. | |
| 726 | + * | |
| 727 | + * $http_errors is disabled so 4xx/5xx responses are returned (not | |
| 728 | + * thrown) — callers need to distinguish e.g. 409 (already exists) and | |
| 729 | + * 404 (already gone) from genuine failures, which is far cleaner done | |
| 730 | + * by inspecting the status code than by parsing exception messages. | |
| 731 | + * @since 1.4.1 | |
| 732 | + */ | |
| 733 | + private function managed_folder_iam_request($method, $path, $body = null) { | |
| 734 | + $keyArray = json_decode($this->config['config_json'], true); | |
| 735 | + $fetcher = CredentialsLoader::makeCredentials( | |
| 736 | + // Matches the vendored StorageClient's own implicit default scope list | |
| 737 | + // (StorageClient.php:166-167) — every StorageClient construction in this | |
| 738 | + // file omits `scopes` and gets this same pair; FULL_CONTROL_SCOPE alone | |
| 739 | + // is narrower and risks a 403 at the OAuth-scope layer, independent of | |
| 740 | + // and prior to whatever IAM role/permission the service account holds. | |
| 741 | + ['https://www.googleapis.com/auth/iam', StorageClient::FULL_CONTROL_SCOPE], | |
| 742 | + $keyArray | |
| 743 | + ); | |
| 744 | + $httpClient = CredentialsLoader::makeHttpClient($fetcher, [ | |
| 745 | + 'timeout' => 15, | |
| 746 | + 'connect_timeout' => 5, | |
| 747 | + ]); | |
| 748 | + | |
| 749 | + $url = 'https://storage.googleapis.com/storage/v1/b/' . rawurlencode($this->bucket_name) . '/managedFolders' . $path; | |
| 750 | + | |
| 751 | + $options = ['http_errors' => false]; | |
| 752 | + if ($body !== null) { | |
| 753 | + $options['json'] = $body; | |
| 754 | + } | |
| 755 | + | |
| 756 | + $response = $httpClient->request($method, $url, $options); | |
| 757 | + | |
| 758 | + return [ | |
| 759 | + 'status' => $response->getStatusCode(), | |
| 760 | + 'body' => json_decode((string) $response->getBody(), true), | |
| 761 | + ]; | |
| 762 | + } | |
| 763 | + | |
| 764 | + /** | |
| 765 | + * Apply (or, with an empty $private_prefix, un-apply) the private-path | |
| 766 | + * carve-out via GCS Managed Folders. | |
| 767 | + * | |
| 768 | + * Google Cloud permanently disallows attaching an IAM Condition to a | |
| 769 | + * binding whose principal is allUsers, so the previous CEL-conditional | |
| 770 | + * approach here could never succeed. Managed Folders let a role be | |
| 771 | + * granted to allUsers scoped to one prefix with no condition at all — | |
| 772 | + * but the grant is purely additive (it can only add access, never | |
| 773 | + * restrict it), so exclusion only works because private_path is a | |
| 774 | + * sibling of base_path, not nested inside it: the Managed Folder is | |
| 775 | + * always scoped to base_path (read directly from settings, not derived | |
| 776 | + * from $private_prefix, which is the *private*-path prefix). | |
| 777 | + * @since 1.4.1 | |
| 778 | + */ | |
| 779 | + public function applyPrivatePathPolicy($private_prefix) { | |
| 780 | + if (!$this->bucket || empty($this->bucket_name)) { | |
| 781 | + return ['success' => false, 'code' => 200, 'message' => esc_html__('Client not configured', 'media-cloud-sync')]; | |
| 782 | + } | |
| 783 | + | |
| 784 | + $base_path = isset($this->settings['base_path']) ? trim($this->settings['base_path'], " \n\r\t\v\x00\/ ") : ''; | |
| 785 | + // Trailing slash: unverified against a live GCS project — Google's own | |
| 786 | + // managedFolder.insert REST reference shows no trailing slash in its | |
| 787 | + // examples, while its separate CLI guide uses one. Captured once here and | |
| 788 | + // reused verbatim (URL-encoded) at every call site below so insert/ | |
| 789 | + // setIamPolicy/delete always address the exact same resource name. | |
| 790 | + $folder_name = $base_path . '/'; | |
| 791 | + | |
| 792 | + try { | |
| 793 | + if (empty($private_prefix)) { | |
| 794 | + // Disable: restore the bucket-wide public grant FIRST, so there's | |
| 795 | + // never a window where base_path content has no public grant at | |
| 796 | + // all — then clean up the now-redundant Managed Folder | |
| 797 | + // (best-effort, not security-critical: the grant that actually | |
| 798 | + // matters is already restored by the time this runs). | |
| 799 | + $this->restore_bucket_level_grant(); | |
| 800 | + | |
| 801 | + if (!empty($base_path)) { | |
| 802 | + $delete = $this->managed_folder_iam_request('DELETE', '/' . rawurlencode($folder_name) . '?allowNonEmpty=true'); | |
| 803 | + if ($delete['status'] >= 300 && $delete['status'] !== 404) { | |
| 804 | + error_log('Media Cloud Sync: failed to delete the GCS Managed Folder for base_path while disabling private media — ' . wp_json_encode($delete['body'])); | |
| 805 | + } | |
| 806 | + } | |
| 807 | + | |
| 808 | + return ['success' => true, 'code' => 200, 'message' => esc_html__('Policy removed successfully', 'media-cloud-sync')]; | |
| 809 | + } | |
| 810 | + | |
| 811 | + if (empty($base_path)) { | |
| 812 | + return ['success' => false, 'code' => 200, 'message' => esc_html__('Google Cloud Storage private media requires a base path — enable it in Storage Settings first.', 'media-cloud-sync')]; | |
| 813 | + } | |
| 814 | + | |
| 815 | + // Uniform Bucket-Level Access and Public Access Prevention need a live | |
| 816 | + // $bucket->info() call, which is why these checks live here rather than | |
| 817 | + // in ProPrivateMedia::apply_policy() (which only has settings, not the | |
| 818 | + // bucket) — the enable_base_path / outside-base_path checks that DON'T | |
| 819 | + // need a live call already ran there, before this method was reached. | |
| 820 | + $info = $this->bucket->info(); | |
| 821 | + $iamConfig = isset($info['iamConfiguration']) ? $info['iamConfiguration'] : []; | |
| 822 | + $ublaEnabled = !empty($iamConfig['uniformBucketLevelAccess']['enabled']); | |
| 823 | + $pap = isset($iamConfig['publicAccessPrevention']) ? $iamConfig['publicAccessPrevention'] : 'inherited'; | |
| 824 | + | |
| 825 | + if (!$ublaEnabled) { | |
| 826 | + return ['success' => false, 'code' => 200, 'message' => esc_html__("This bucket doesn't have Uniform Bucket-Level Access enabled — enable it in your Google Cloud Storage bucket settings first.", 'media-cloud-sync')]; | |
| 827 | + } | |
| 828 | + if ($pap === 'enforced') { | |
| 829 | + return ['success' => false, 'code' => 200, 'message' => esc_html__('Public Access Prevention is enabled for this bucket — disable it first in Bucket Security, since it blocks the public side of this feature too.', 'media-cloud-sync')]; | |
| 830 | + } | |
| 831 | + | |
| 832 | + // Enable, in an order that never leaves a window with no public access: | |
| 833 | + // create + set the Managed Folder's grant first (purely additive — safe | |
| 834 | + // to briefly overlap with the still-present bucket-wide grant), only | |
| 835 | + // then drop the bucket-wide grant. | |
| 836 | + $insert = $this->managed_folder_iam_request('POST', '', ['name' => $folder_name]); | |
| 837 | + if ($insert['status'] >= 300 && $insert['status'] !== 409) { | |
| 838 | + $message = isset($insert['body']['error']['message']) ? $insert['body']['error']['message'] : esc_html__('Failed to create the Managed Folder for your base path.', 'media-cloud-sync'); | |
| 839 | + return ['success' => false, 'code' => 200, 'message' => $message]; | |
| 840 | + } | |
| 841 | + | |
| 842 | + $setIam = $this->managed_folder_iam_request('PUT', '/' . rawurlencode($folder_name) . '/iam', [ | |
| 843 | + 'bindings' => [ | |
| 844 | + [ | |
| 845 | + 'role' => 'roles/storage.objectViewer', | |
| 846 | + 'members' => ['allUsers'], | |
| 847 | + ], | |
| 848 | + ], | |
| 849 | + ]); | |
| 850 | + if ($setIam['status'] >= 300) { | |
| 851 | + $message = isset($setIam['body']['error']['message']) ? $setIam['body']['error']['message'] : esc_html__('Failed to grant public access on the Managed Folder.', 'media-cloud-sync'); | |
| 852 | + return ['success' => false, 'code' => 200, 'message' => $message]; | |
| 853 | + } | |
| 854 | + | |
| 855 | + // Only once the Managed Folder grant is confirmed in effect (both calls | |
| 856 | + // above succeeded): drop the bucket-wide grant so nothing is public | |
| 857 | + // bucket-wide anymore. If either call above failed, we stop before this | |
| 858 | + // line — the bucket is left exactly as it was (bucket-level grant still | |
| 859 | + // in place, no Managed Folder actively granting anything since its IAM | |
| 860 | + // policy was never successfully set), a safe, easily-retried state. | |
| 861 | + $this->drop_bucket_level_grant(); | |
| 862 | + | |
| 863 | + return ['success' => true, 'code' => 200, 'message' => esc_html__('Policy applied successfully', 'media-cloud-sync')]; | |
| 864 | + } catch (ServiceException $e) { | |
| 865 | + return ['success' => false, 'code' => 200, 'message' => $e->getMessage()]; | |
| 866 | + } catch (Exception $e) { | |
| 867 | + return ['success' => false, 'code' => 200, 'message' => $e->getMessage()]; | |
| 868 | + } | |
| 869 | + } | |
| 870 | + | |
| 871 | + /** | |
| 872 | + * Read the bucket's Public Access Prevention state — GCS's closest | |
| 873 | + * analog to S3's Block Public Access. Built from a fresh StorageClient/ | |
| 874 | + * Bucket from the passed params (not $this->gcloudClient/$this->bucket) | |
| 875 | + * so this works during initial setup in the Configure wizard, before | |
| 876 | + * the connection being configured is the saved/active one — matching | |
| 877 | + * S3's own getBucketSecuritySettings() pattern. | |
| 878 | + * @since 1.4.1 | |
| 879 | + */ | |
| 880 | + public function getBucketSecuritySettings($config = [], $bucketConfig = []) { | |
| 881 | + $config_json = isset($config['config_json']) ? $config['config_json'] : ''; | |
| 882 | + $bucket_name = isset($bucketConfig['bucket_name']) ? $bucketConfig['bucket_name'] : ''; | |
| 883 | + | |
| 884 | + if (empty($config_json) || empty($bucket_name) || !Utils::is_json($config_json)) { | |
| 885 | + return ['message' => esc_html__('Insufficient Data. Please try again', 'media-cloud-sync'), 'code' => 200, 'success' => false]; | |
| 886 | + } | |
| 887 | + | |
| 888 | + try { | |
| 889 | + $keyArray = json_decode($config_json, true); | |
| 890 | + if (!is_array($keyArray)) { | |
| 891 | + return ['message' => esc_html__('JSON Configuration is invalid', 'media-cloud-sync'), 'code' => 200, 'success' => false]; | |
| 892 | + } | |
| 893 | + | |
| 894 | + $client = new StorageClient(['keyFile' => $keyArray]); | |
| 895 | + $bucket = $client->bucket($bucket_name); | |
| 896 | + $info = $bucket->info(); | |
| 897 | + $pap = isset($info['iamConfiguration']['publicAccessPrevention']) ? $info['iamConfiguration']['publicAccessPrevention'] : 'inherited'; | |
| 898 | + | |
| 899 | + $security = ['block_public_access' => $pap === 'enforced']; | |
| 900 | + | |
| 901 | + return ['message' => '', 'code' => 200, 'success' => true, 'security' => $security]; | |
| 902 | + } catch (ServiceException $e) { | |
| 903 | + return ['message' => $e->getMessage() ?: esc_html__('Please check the authorization details', 'media-cloud-sync'), 'code' => 200, 'success' => false]; | |
| 904 | + } catch (Exception $e) { | |
| 905 | + return ['message' => $e->getMessage() ?: esc_html__('Please check the authorization details', 'media-cloud-sync'), 'code' => 200, 'success' => false]; | |
| 906 | + } | |
| 907 | + } | |
| 908 | + | |
| 909 | + /** | |
| 910 | + * Set the bucket's Public Access Prevention state. Built from a fresh | |
| 911 | + * StorageClient/Bucket from the passed params — same reasoning as | |
| 912 | + * getBucketSecuritySettings() above. No changeObjectOwnership() | |
| 913 | + * equivalent here — GCS has no matching concept; the generic dispatcher | |
| 914 | + * simply hides that field via method_exists() when it's undefined. | |
| 915 | + * @since 1.4.1 | |
| 916 | + */ | |
| 917 | + public function changePublicAccess($config = [], $bucketConfig = [], $value = false) { | |
| 918 | + $config_json = isset($config['config_json']) ? $config['config_json'] : ''; | |
| 919 | + $bucket_name = isset($bucketConfig['bucket_name']) ? $bucketConfig['bucket_name'] : ''; | |
| 920 | + | |
| 921 | + if (empty($config_json) || empty($bucket_name) || !Utils::is_json($config_json)) { | |
| 922 | + return ['message' => esc_html__('Insufficient Data. Please try again', 'media-cloud-sync'), 'code' => 200, 'success' => false]; | |
| 923 | + } | |
| 924 | + | |
| 925 | + try { | |
| 926 | + $keyArray = json_decode($config_json, true); | |
| 927 | + if (!is_array($keyArray)) { | |
| 928 | + return ['message' => esc_html__('JSON Configuration is invalid', 'media-cloud-sync'), 'code' => 200, 'success' => false]; | |
| 929 | + } | |
| 930 | + | |
| 931 | + $client = new StorageClient(['keyFile' => $keyArray]); | |
| 932 | + $bucket = $client->bucket($bucket_name); | |
| 933 | + $bucket->update([ | |
| 934 | + 'iamConfiguration' => [ | |
| 935 | + 'publicAccessPrevention' => $value ? 'enforced' : 'inherited', | |
| 936 | + ], | |
| 937 | + ]); | |
| 938 | + | |
| 939 | + return ['message' => '', 'code' => 200, 'success' => true]; | |
| 940 | + } catch (ServiceException $e) { | |
| 941 | + return ['message' => $e->getMessage() ?: esc_html__('Please check the authorization details', 'media-cloud-sync'), 'code' => 200, 'success' => false]; | |
| 942 | + } catch (Exception $e) { | |
| 943 | + return ['message' => $e->getMessage() ?: esc_html__('Please check the authorization details', 'media-cloud-sync'), 'code' => 200, 'success' => false]; | |
| 944 | + } | |
| 945 | + } | |
| 946 | + | |
| 947 | + | |
| 948 | + /** | |
| 949 | + * Check the object exist | |
| 659 | 950 | * @since 1.1.8 |
| 660 | 951 | */ |
| 661 | 952 | public function exists($key, $bucket = null) { |
| 662 | 953 | if(!$key) return false; |
| @@ -740,9 +1031,9 @@ | ||
| 740 | 1031 | * Upload Single |
| 741 | 1032 | * @since 1.0.0 |
| 742 | 1033 | * @return boolean |
| 743 | 1034 | */ |
| 744 | - public function uploadSingle($absolute_source_path, $relative_source_path, $prefix=''){ | |
| 1035 | + public function uploadSingle($absolute_source_path, $relative_source_path, $prefix='', $is_private = false){ | |
| 745 | 1036 | if ( |
| 746 | 1037 | isset($absolute_source_path) && !empty($absolute_source_path) && |
| 747 | 1038 | isset($relative_source_path) && !empty($relative_source_path) |
| 748 | 1039 | ) { |
| @@ -747,9 +1038,16 @@ | ||
| 747 | 1038 | isset($relative_source_path) && !empty($relative_source_path) |
| 748 | 1039 | ) { |
| 749 | 1040 | $file_name = wp_basename( $relative_source_path ); |
| 750 | 1041 | if ($file_name) { |
| 751 | - $upload_path = Utils::generate_object_key($relative_source_path, $prefix); | |
| 1042 | + $upload_path = Utils::generate_object_key($relative_source_path, $prefix, $is_private); | |
| 1043 | + if ($upload_path === false) { | |
| 1044 | + return [ | |
| 1045 | + 'success' => false, | |
| 1046 | + 'code' => 200, | |
| 1047 | + 'message' => esc_html__('This file is marked private, but the private-media add-on is not currently active — reupload skipped to avoid exposing it.', 'media-cloud-sync') | |
| 1048 | + ]; | |
| 1049 | + } | |
| 752 | 1050 | return $this->execute_upload($absolute_source_path, $upload_path); |
| 753 | 1051 | } |
| 754 | 1052 | return [ |
| 755 | 1053 | 'success' => false, |
