Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 0d1575d

Browse files
committed
Merge branch 'issue151-missing-calls'
2 parents 1f588a3 + cb85a20 commit 0d1575d

File tree

3 files changed

+96
-12
lines changed

3 files changed

+96
-12
lines changed

CloudFlare/api_v4.py

Lines changed: 90 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ def api_v4(self):
6868
# The API commands for /graphql
6969
graphql(self)
7070

71+
# Issue 151
72+
from_developers(self)
73+
7174
def user(self):
7275
""" user """
7376

@@ -93,6 +96,8 @@ def zones(self):
9396
self.add('AUTH', 'zones', 'available_plans')
9497
self.add('AUTH', 'zones', 'available_rate_plans')
9598
self.add('AUTH', 'zones', 'bot_management')
99+
self.add('AUTH', 'zones', 'bot_management/feedback')
100+
self.add('AUTH', 'zones', 'client_certificates')
96101
self.add('AUTH', 'zones', 'custom_certificates')
97102
self.add('AUTH', 'zones', 'custom_certificates/prioritize')
98103
self.add('AUTH', 'zones', 'custom_csrs')
@@ -104,7 +109,10 @@ def zones(self):
104109
self.add('AUTH', 'zones', 'dns_records/export')
105110
self.add('AUTH', 'zones', 'dns_records/import')
106111
self.add('AUTH', 'zones', 'dns_records/scan')
112+
self.add('VOID', 'zones', 'dns_settings')
113+
self.add('AUTH', 'zones', 'dns_settings/use_apex_ns')
107114
self.add('AUTH', 'zones', 'filters')
115+
self.add('AUTH', 'zones', 'filters/validate-expr')
108116
self.add('AUTH', 'zones', 'healthchecks')
109117
self.add('AUTH', 'zones', 'healthchecks/preview')
110118
self.add('AUTH', 'zones', 'keyless_certificates')
@@ -177,8 +185,8 @@ def zones_analytics(self):
177185
""" zones analytics """
178186

179187
self.add('VOID', 'zones', 'analytics')
180-
# self.add('AUTH', 'zones', 'analytics/colos')
181-
# self.add('AUTH', 'zones', 'analytics/dashboard')
188+
self.add('AUTH', 'zones', 'analytics/colos')
189+
self.add('AUTH', 'zones', 'analytics/dashboard')
182190
self.add('AUTH', 'zones', 'analytics/latency')
183191
self.add('AUTH', 'zones', 'analytics/latency/colos')
184192

@@ -465,6 +473,7 @@ def accounts_load_balancers(self):
465473
self.add('AUTH', 'accounts', 'load_balancers/regions')
466474
self.add('AUTH', 'accounts', 'load_balancers/search')
467475

476+
468477
def accounts_firewall(self):
469478
""" accounts firewall """
470479

@@ -477,7 +486,7 @@ def accounts_secondary_dns(self):
477486

478487
self.add('VOID', 'accounts', 'secondary_dns')
479488
# self.add('AUTH', 'accounts', 'secondary_dns/masters')
480-
# self.add('AUTH', 'accounts', 'secondary_dns/primaries')
489+
self.add('AUTH', 'accounts', 'secondary_dns/primaries')
481490
self.add('AUTH', 'accounts', 'secondary_dns/tsigs')
482491
self.add('AUTH', 'accounts', 'secondary_dns/acls')
483492
self.add('AUTH', 'accounts', 'secondary_dns/peers')
@@ -541,9 +550,11 @@ def accounts_access(self):
541550

542551
self.add('VOID', 'accounts', 'access')
543552
self.add('AUTH', 'accounts', 'access/bookmarks')
553+
self.add('AUTH', 'accounts', 'access/gateway_ca')
544554
self.add('AUTH', 'accounts', 'access/groups')
545555
self.add('AUTH', 'accounts', 'access/identity_providers')
546556
self.add('AUTH', 'accounts', 'access/organizations')
557+
self.add('AUTH', 'accounts', 'access/organizations/doh')
547558
self.add('AUTH', 'accounts', 'access/organizations/revoke_user')
548559
self.add('AUTH', 'accounts', 'access/service_tokens')
549560
self.add('AUTH', 'accounts', 'access/service_tokens', 'refresh')
@@ -829,3 +840,79 @@ def radar(self):
829840
self.add('VOID', 'radar/verified_bots/top')
830841
self.add('AUTH', 'radar/verified_bots/top/bots')
831842
self.add('AUTH', 'radar/verified_bots/top/categories')
843+
844+
def from_developers(self):
845+
""" from_developers """
846+
self.add('VOID', 'accounts', 'analytics_engine')
847+
self.add('AUTH', 'accounts', 'analytics_engine/sql')
848+
849+
self.add('AUTH', 'accounts', 'images/v1/config')
850+
self.add('AUTH', 'accounts', 'images/v1/direct_upload')
851+
852+
self.add('VOID', 'accounts', 'logpush')
853+
self.add('AUTH', 'accounts', 'logpush/jobs')
854+
855+
self.add('VOID', 'accounts', 'logs')
856+
self.add('AUTH', 'accounts', 'logs/retrieve')
857+
858+
self.add('VOID', 'accounts', 'magic/advanced_tcp_protection')
859+
self.add('VOID', 'accounts', 'magic/advanced_tcp_protection/configs')
860+
self.add('AUTH', 'accounts', 'magic/advanced_tcp_protection/configs/allowlist')
861+
self.add('AUTH', 'accounts', 'magic/advanced_tcp_protection/configs/prefixes')
862+
self.add('AUTH', 'accounts', 'magic/advanced_tcp_protection/configs/prefixes/bulk')
863+
self.add('VOID', 'accounts', 'magic/advanced_tcp_protection/configs/syn_protection')
864+
self.add('AUTH', 'accounts', 'magic/advanced_tcp_protection/configs/syn_protection/rules')
865+
self.add('VOID', 'accounts', 'magic/advanced_tcp_protection/configs/tcp_flow_protection')
866+
self.add('AUTH', 'accounts', 'magic/advanced_tcp_protection/configs/tcp_flow_protection/rules')
867+
self.add('AUTH', 'accounts', 'magic/advanced_tcp_protection/configs/tcp_protection_status')
868+
869+
self.add('VOID', 'accounts', 'pubsub')
870+
self.add('AUTH', 'accounts', 'pubsub/namespaces')
871+
self.add('AUTH', 'accounts', 'pubsub/namespaces', 'brokers')
872+
self.add('AUTH', 'accounts', 'pubsub/namespaces', 'brokers', 'credentials')
873+
874+
self.add('VOID', 'accounts', 'rulesets', 'versions', 'by_tag')
875+
self.add('AUTH', 'accounts', 'rulesets', 'versions', 'by_tag/wordpress')
876+
self.add('VOID', 'accounts', 'rulesets/phases/ddos_l4')
877+
self.add('AUTH', 'accounts', 'rulesets/phases/ddos_l4/entrypoint')
878+
self.add('VOID', 'accounts', 'rulesets/phases/ddos_l7')
879+
self.add('AUTH', 'accounts', 'rulesets/phases/ddos_l7/entrypoint')
880+
self.add('VOID', 'accounts', 'rulesets/phases/http_request_firewall_custom')
881+
self.add('AUTH', 'accounts', 'rulesets/phases/http_request_firewall_custom/entrypoint')
882+
self.add('VOID', 'accounts', 'rulesets/phases/http_request_firewall_managed')
883+
self.add('AUTH', 'accounts', 'rulesets/phases/http_request_firewall_managed/entrypoint')
884+
885+
self.add('VOID', 'accounts', 'stream/analytics')
886+
self.add('AUTH', 'accounts', 'stream/analytics/views')
887+
self.add('AUTH', 'accounts', 'stream/live_inputs', 'videos')
888+
889+
self.add('VOID', 'accounts', 'workers/dispatch')
890+
self.add('AUTH', 'accounts', 'workers/dispatch/namespaces')
891+
self.add('AUTH', 'accounts', 'workers/dispatch/namespaces', 'scripts')
892+
self.add('AUTH', 'accounts', 'workers/dispatch/namespaces', 'scripts', 'tags')
893+
894+
# self.add('AUTH', 'organizations', 'load_balancers/monitors')
895+
896+
self.add('AUTH', 'users')
897+
898+
self.add('VOID', 'zones', 'content-upload-scan')
899+
self.add('AUTH', 'zones', 'content-upload-scan/disable')
900+
self.add('AUTH', 'zones', 'content-upload-scan/enable')
901+
self.add('AUTH', 'zones', 'content-upload-scan/payloads')
902+
self.add('AUTH', 'zones', 'content-upload-scan/settings')
903+
904+
self.add('VOID', 'zones', 'phases')
905+
self.add('VOID', 'zones', 'phases/http_request_firewall_managed')
906+
self.add('AUTH', 'zones', 'phases/http_request_firewall_managed/entrypoint')
907+
908+
self.add('VOID', 'zones', 'rulesets/phases/ddos_l7')
909+
self.add('AUTH', 'zones', 'rulesets/phases/ddos_l7/entrypoint')
910+
self.add('VOID', 'zones', 'rulesets/phases/http_ratelimit')
911+
self.add('AUTH', 'zones', 'rulesets/phases/http_ratelimit/entrypoint')
912+
self.add('VOID', 'zones', 'rulesets/phases/http_request_cache_settings')
913+
self.add('AUTH', 'zones', 'rulesets/phases/http_request_cache_settings/entrypoint')
914+
self.add('VOID', 'zones', 'rulesets/phases/http_request_firewall_custom')
915+
self.add('AUTH', 'zones', 'rulesets/phases/http_request_firewall_custom/entrypoint')
916+
self.add('VOID', 'zones', 'rulesets/phases/http_request_firewall_managed')
917+
self.add('AUTH', 'zones', 'rulesets/phases/http_request_firewall_managed/entrypoint')
918+
self.add('AUTH', 'zones', 'rulesets/phases/http_request_firewall_managed/entrypoint/versions')

CloudFlare/cloudflare.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -572,27 +572,27 @@ def __str__(self):
572572
def get(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
573573
""" Cloudflare v4 API"""
574574

575-
raise CloudFlareAPIError(0, 'get() call not available for this endpoint')
575+
raise CloudFlareAPIError(0, 'not found')
576576

577577
def patch(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
578578
""" Cloudflare v4 API"""
579579

580-
raise CloudFlareAPIError(0, 'patch() call not available for this endpoint')
580+
raise CloudFlareAPIError(0, 'not found')
581581

582582
def post(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None, files=None):
583583
""" Cloudflare v4 API"""
584584

585-
raise CloudFlareAPIError(0, 'post() call not available for this endpoint')
585+
raise CloudFlareAPIError(0, 'not found')
586586

587587
def put(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
588588
""" Cloudflare v4 API"""
589589

590-
raise CloudFlareAPIError(0, 'put() call not available for this endpoint')
590+
raise CloudFlareAPIError(0, 'not found')
591591

592592
def delete(self, identifier1=None, identifier2=None, identifier3=None, identifier4=None, params=None, data=None):
593593
""" Cloudflare v4 API"""
594594

595-
raise CloudFlareAPIError(0, 'delete() call not available for this endpoint')
595+
raise CloudFlareAPIError(0, 'not found')
596596

597597
class _add_no_auth():
598598
""" Cloudflare v4 API"""

cli4/cli4.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,7 @@ def run_command(cf, method, command, params=None, content=None, files=None):
159159
cmd.append(element)
160160
except AttributeError:
161161
# the verb/element was not found
162-
if len(cmd) == 0:
163-
sys.stderr.write('cli4: /%s - not found\n' % (element))
164-
else:
165-
sys.stderr.write('cli4: /%s/%s - not found\n' % ('/'.join(cmd), element))
162+
sys.stderr.write('cli4: /%s - not found\n' % (command))
166163
raise e
167164

168165
if content and params:

0 commit comments

Comments
 (0)