Skip to content

fixed bytes/encoding/string problems #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mezzomaniac wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed bytes/encoding/string problems #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions RESTful service/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import base64
import hmac
import hashlib
import urllib
import time
import requests
import json
Expand All @@ -12,7 +11,7 @@
'host': 'api.acrcloud.com',
'signature_version': '1',
'access_key': '<your account access key>',
'access_secret': '<your account access secret>',
'access_secret': b'<your account access secret>',
};


Expand All @@ -28,9 +27,9 @@ def create_project(name, region, type, buckets, audio_type, external_id):

string_to_sign = '\n'.join((http_method, uri, option['access_key'], option['signature_version'], str(timestamp)))

signature = sign(string_to_sign, option['access_secret'])
signature = sign(string_to_sign.encode(), option['access_secret'])

headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp}
headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)}

data = {'name':name, 'region':region, 'type':type, 'buckets':json.dumps(buckets), 'audio_type':audio_type, 'external_id':external_id}

Expand All @@ -47,9 +46,9 @@ def update_project(name, buckets):

string_to_sign = '\n'.join((http_method, uri, option['access_key'], option['signature_version'], str(timestamp)))

signature = sign(string_to_sign, option['access_secret'])
signature = sign(string_to_sign.encode(), option['access_secret'])

headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp}
headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)}

data = {'buckets':json.dumps(buckets)}

Expand All @@ -65,9 +64,9 @@ def delete_project(name):

string_to_sign = '\n'.join((http_method, uri, option['access_key'], option['signature_version'], str(timestamp)))

signature = sign(string_to_sign, option['access_secret'])
signature = sign(string_to_sign.encode(), option['access_secret'])

headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp}
headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)}

data = {'name':name}

Expand All @@ -82,8 +81,8 @@ def get_project(project_name):
http_uri = "/v1/projects/"+project_name

string_to_sign = '\n'.join((http_method, http_uri, option['access_key'], option['signature_version'], str(timestamp)))
signature = sign(string_to_sign, option['access_secret'])
headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp}
signature = sign(string_to_sign.encode(), option['access_secret'])
headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)}

requrl = "https://"+option['host'] + http_uri
r = requests.get(requrl, headers=headers, verify=True)
Expand All @@ -96,8 +95,8 @@ def list_projects():
http_uri = "/v1/projects"

string_to_sign = '\n'.join((http_method, http_uri, option['access_key'], option['signature_version'], str(timestamp)))
signature = sign(string_to_sign, option['access_secret'])
headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp}
signature = sign(string_to_sign.encode(), option['access_secret'])
headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)}

requrl = "https://"+option['host'] + http_uri
r = requests.get(requrl, headers=headers, verify=True)
Expand Down