Video-2474 added fixes to credentials and s3sink class, added test (m…

…aybe removed later since we really don't want to allow creds to be read -- but needed the test as a sanity check)

src/gstawscredentials.cpp

@@ -29,6 +29,8 @@ GST_DEBUG_CATEGORY_STATIC (gst_aws_credentials_debug);
 
 using namespace Aws::Auth;
 
+static GstAWSCredentials * _gst_aws_credentials_from_string (const gchar * str);
+
 struct _GstAWSCredentials {
   _GstAWSCredentials(GstAWSCredentialsProviderFactory factory) :
     credentials_provider_factory(std::move(factory))
@@ -71,9 +73,10 @@ gst_aws_credentials_free (GstAWSCredentials * credentials)
 }
 
 GstAWSCredentials *
-gst_aws_credentials_new_from_string(const gchar * str)
+gst_aws_credentials_new_from_string(const gchar * s)
 {
-  return _gst_aws_credentials_from_string (str);
+ // gst_aws_credentials_new_default();
+  return _gst_aws_credentials_from_string (s);
 }
 
 

src/gstawscredentials.h

@@ -45,6 +45,4 @@ GstAWSCredentials * gst_aws_credentials_new_from_string(const gchar * str);
 
 G_END_DECLS
 
-static GstAWSCredentials * _gst_aws_credentials_from_string (const gchar * str);
-
 #endif /* __GST_AWS_CREDENTIALS_H__ */

src/gsts3sink.c

@@ -226,7 +226,7 @@ gst_s3_sink_class_init (GstS3SinkClass * klass)
   g_object_class_install_property (gobject_class, PROP_CREDENTIALS_STRING,
     g_param_spec_string("aws-credentials-string", "AWS credentials (string)",
       "The AWS credentials to use parsed from string", NULL,
-      G_PARAM_WRITABLE | GST_PARAM_MUTABLE_READY | G_PARAM_STATIC_STRINGS));
+      G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class, PROP_AWS_SDK_ENDPOINT,
     g_param_spec_string ("aws-sdk-endpoint", "AWS SDK Endpoint",
@@ -427,7 +427,8 @@ gst_s3_sink_set_property (GObject * object, guint prop_id,
     case PROP_CREDENTIALS_STRING:
       if (sink->config.credentials)
         gst_aws_credentials_free (sink->config.credentials);
-      sink->config.credentials = gst_aws_credentials_new_from_string(g_value_get_string (value));
+      gst_s3_sink_set_string_property (sink, g_value_get_string (value), &sink->credentials_string, "aws-credentials-string");
+      sink->config.credentials = gst_aws_credentials_new_from_string(sink->credentials_string);
       break;
     case PROP_AWS_SDK_ENDPOINT:
       gst_s3_sink_set_string_property (sink, g_value_get_string (value),
@@ -523,7 +524,7 @@ gst_s3_sink_get_property (GObject * object, guint prop_id, GValue * value,
       g_value_set_int (value, sink->config.cache_num_parts);
       break;
     case PROP_CREDENTIALS_STRING:
-    //  g_value_set_string (value, sink->config.region);
+      g_value_set_string (value, sink->credentials_string);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

src/gsts3sink.h

@@ -81,6 +81,8 @@ struct _GstS3Sink {
   // doing any download/copy-upload -like operations
   // that would require the uploader to 'complete'
   gboolean uploader_needs_complete;
+
+  gchar * credentials_string;
 };
 
 struct _GstS3SinkClass {

tests/check/s3sink.c

@@ -86,6 +86,30 @@ GST_START_TEST (test_location_property)
 }
 GST_END_TEST
 
+GST_START_TEST (test_credentials_property)
+{
+  GstElement *sink = gst_element_factory_make ("s3sink", "sink");
+  const gchar *location = "s3://bucket/key";
+
+  gchar *returned_credentials = NULL;
+  gchar * credentialstr = "access-key-id=someAccessKey";
+
+  fail_if (sink == NULL);
+
+  // Set location, then set bucket and key, verify location is used
+  g_object_set (sink, "aws-credentials-string", "access-key-id=someAccessKey", NULL);
+  g_object_set (sink,
+    "bucket", "new-bucket",
+    "key", "new-key",
+    NULL);
+  g_object_get (sink, "aws-credentials-string", &returned_credentials, NULL);
+  fail_if (0 != g_ascii_strcasecmp("access-key-id=someAccessKey", returned_credentials));
+  g_free (returned_credentials);
+
+  gst_object_unref (sink);
+}
+GST_END_TEST
+
 GST_START_TEST (test_gst_urihandler_interface)
 {
   GstElement *s3Sink = gst_element_make_from_uri(GST_URI_SINK, "s3://bucket/key", "s3sink", NULL);
@@ -821,6 +845,7 @@ s3sink_suite (void)
   suite_add_tcase (s, tc_chain);
   tcase_add_test (tc_chain, test_no_bucket_and_key_then_start_should_fail);
   tcase_add_test (tc_chain, test_location_property);
+  tcase_add_test (tc_chain, test_credentials_property);
   tcase_add_test (tc_chain, test_gst_urihandler_interface);
   tcase_add_test (tc_chain, test_change_properties_after_start_should_fail);
   tcase_add_test (tc_chain, test_send_eos_should_flush_buffer);